1

app.json

@@ -77,8 +77,13 @@
     "van-checkbox": "@vant/weapp/checkbox/index",
     "van-checkbox-group": "@vant/weapp/checkbox-group/index",
     "van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
+<<<<<<< HEAD
     "van-dropdown-item": "@vant/weapp/dropdown-item/index"
     
+=======
+    "van-dropdown-item": "@vant/weapp/dropdown-item/index",
+    "van-popup": "@vant/weapp/popup/index"
+>>>>>>> 29a010892133f077fb8f534c4b4fccd20f4355e3
   }
   
 }

components/indexCom/dataChild/index.wxml

@@ -31,15 +31,15 @@
             </view>
         </view>
         <view class="total">
-                <view class="total_content" wx:for="{{totallist}}" wx:key="url" bindtap="dynamic">
-                    <view class="content_img">
-                        <image src="{{item.url}}" style="width: 100%;height: 100%;"></image>
-                    </view>
-                    <view class="content_text">
-                        <view class="total_text">{{item.text}}</view>
-                        <view class="total_num">{{item.num}}%</view>
-                    </view>
+            <view class="total_content" wx:for="{{totallist}}" wx:key="url" bindtap="dynamic">
+                <view class="content_img">
+                    <image src="{{item.url}}" style="width: 100%;height: 100%;"></image>
                 </view>
+                <view class="content_text">
+                    <view class="total_text">{{item.text}}</view>
+                    <view class="total_num">{{item.num}}%</view>
+                </view>
+            </view>
         </view>
 
     </view>

pages/index/Brandsales/Brandsales.js

@@ -91,6 +91,14 @@ priceSel(e){
         priceSelected: e.currentTarget.dataset.index
     })
 },
+//详情跳转
+detail(){
+        wx.navigateTo({
+          url: '/pages/index/detailedvolume/detailedvolume',
+        })
+
+},
+
 showPopup() {
     this.setData({ show: true });
   },

pages/index/Brandsales/Brandsales.json

@@ -3,7 +3,6 @@
     "usingComponents": {
        "chart-display":"/components/chartdisplay/index",
        "van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
-       "van-icon": "@vant/weapp/icon/index",
-       "van-popup": "@vant/weapp/popup/index"
+       "van-icon": "@vant/weapp/icon/index"
     }
 }

pages/index/Brandsales/Brandsales.wxml

@@ -42,10 +42,9 @@
             <view class="media_text" style="width: 30%;">{{item.vehicle}}</view>
             <view style="width: 30%;">
                 <view class="volume">{{item.share}}</view>
-                <view class="trend">
+                <view class="trend" bindtap="detail">
                     <view>详细销量</view>
                 </view>
-
             </view>
         </view>
 

pages/index/Rankdetail/Rankdetail.js

@@ -15,9 +15,11 @@
                   value1: 1
               }
           ],
-          value:0
-        //   时间
-,          priceOpt: ['2022年5月','2022年4月','2022年3月',
+
+          value:0,
+        //   时间  
+          priceOpt: ['2022年5月','2022年4月','2022年3月',
+
                       '2022年2月','2022年1月','2021年12月',
                       '2021年11月','2021年10月','2021年9月',
                       '2021年8月','2021年7月','2021年6月',
@@ -202,6 +204,13 @@
       this.setData({
           show:false
       });
+  },
+  onclick() {
+    this.setData({ show: true });
+  },
+ 
+  onClose() {
+    this.setData({ show: false });
   },
       /**
        * 生命周期函数--监听页面加载

pages/index/Rankdetail/Rankdetail.wxml

@@ -15,7 +15,7 @@
     <van-dropdown-menu active-color="#027AFF">
         <van-dropdown-item id="priceOpt" value="{{ value }}" title="2022年05月">
             <view class="condition">
-                <text wx:for="{{priceOpt}}" class="{{index === priceSelected?'active':''}}" data-index="{{index}}" bindtap="priceSel">{{item}}</text>
+                <view wx:for="{{priceOpt}}" wx:key="index" class="{{index === priceSelected?'active':''}}" data-index="{{index}}" bindtap="priceSel">{{item}}</view>
             </view>
         </van-dropdown-item>
         <van-dropdown-item value="{{ value1 }}" options="{{ sortOpt }}" title="列表展示" bind:change="dropdownSel" />
@@ -31,7 +31,7 @@
 </view>
 <view class="list_event" wx:if="{{item.value1===1}}">
     <view class="text">销量排行榜</view>
-   <chart-display></chart-display>
+    <chart-display></chart-display>
 </view>
 <view class="list_event" wx:else>
     <view class="text">销量排行榜</view>
@@ -63,14 +63,23 @@
             </view>
             <view style="width: 30%;">
                 <view class="volume">{{item.volume}}</view>
+<<<<<<< HEAD
                 <view class="trend" >
+=======
+                <view class="trend" bindtap="onclick">
+>>>>>>> 29a010892133f077fb8f534c4b4fccd20f4355e3
                     <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>
 <!-- </view> -->