排行

pages/index/Brandsales/Brandsales.json

@@ -4,7 +4,6 @@
        "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-datetime-picker": "@vant/weapp/datetime-picker/index"
+       "van-popup": "@vant/weapp/popup/index"
     }
 }

pages/index/Brandsales/Brandsales.wxml

@@ -1,12 +1,14 @@
 <view class="list_event">
-    <view class="text">
-        <!-- <van-cell title="展示弹出层" is-link bind:click="showPopup" />
+    <view style="padding: 32rpx;">
+        <view class="text">
+            <!-- <van-cell title="展示弹出层" is-link bind:click="showPopup" />
         <van-popup show="{{ show }}" bind:close="onClose">
             <view class="popup">
                 <van-datetime-picker type="year-month" value="{{ currentDate }}" min-date="{{ minDate }}" bind:input="onInput" />
             </view>
 
         </van-popup> -->
+<<<<<<< HEAD
         <!-- 底部 -->
         <view class="section" style="padding:20rpx">
             <picker mode="date" value="{{date}}" start="1800-01-01" end="{{end}}" bindchange="bindDateChange">
@@ -26,8 +28,31 @@
             </picker> <van-icon name="arrow-down" style="color:#0084FF"/>
         </view>
         <!-- <van-cell bindtap="start"></van-cell>
+=======
+            <!-- 底部 -->
+            <view class="section" style="padding:20rpx">
+                <picker mode="date" value="{{date}}" start="1800-01-01" end="2022-12-30" bindchange="bindDateChange">
+                    <view class="picker">
+                        {{date}}
+                    </view>
+                </picker>
+                <van-icon name="arrow-down" style="color:#0084FF" />
+            </view>
+            <view class="line">——</view>
+            <view class="section" style="padding:20rpx">
+                <picker mode="date" value="{{date2}}" start="1800-01-01" end="2022-12-30" bindchange="bindDateChange2">
+                    <view class="picker">
+                        {{date2}}
+                    </view>
+
+                </picker>
+                <van-icon name="arrow-down" style="color:#0084FF" />
+            </view>
+            <!-- <van-cell bindtap="start"></van-cell>
+>>>>>>> eb3071f41e1545e25ea0b7c1fcd74a1245d2b39b
       <view >——</view>
       <van-cell bindtap="end"></van-cell> -->
+        </view>
     </view>
     <view class="ranking">
         <view class="title">时间</view>

pages/index/Brandsales/Brandsales.wxss

@@ -7,7 +7,7 @@
     width: 686rpx;
     border-radius: 8rpx;
     background-color: #ffffff;
-    padding-top: 32rpx;
+    /* padding-top: 32rpx; */
 
 }
 
@@ -15,21 +15,24 @@
     display: flex;
     align-items: center;
     background-color: #F9F9F9;
-    margin: 32rpx;
+    /* margin: 32rpx; */
     height: 56rpx;
-  justify-content: center;
-    
+    justify-content: center;
+
 }
-.picker{
+
+.picker {
     color: #0084FF;
 }
-.line{
+
+.line {
     color: #D0D0D0;
 }
+
 .ranking {
     width: 686rpx;
     display: flex;
-    padding: 32rpx 32rpx 0 32rpx;
+    padding: 0rpx 32rpx 0 32rpx;
 }
 
 .title {
@@ -77,14 +80,17 @@
     flex-direction: row-reverse;
     color: #027AFF;
 }
-.time_text{
+
+.time_text {
     font-size: 24rpx;
     color: #333333;
 }
-.section{
+
+.section {
     display: flex;
 }
-.popup{
+
+.popup {
     width: 600rpx;
     height: 600rpx;
 }