排行

pages/index/Brandsales/Brandsales.wxml

@@ -1,14 +1,12 @@
 <view class="list_event">
-    <view style="padding: 32rpx;">
-        <view class="text">
-            <!-- <van-cell title="展示弹出层" is-link bind:click="showPopup" />
+    <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">
@@ -20,7 +18,7 @@
         </view>
         <view class="line">——</view>
         <view class="section" style="padding:20rpx">
-            <picker mode="date" value="{{date2}}" start="2000-01-01" end="{{end}}" bindchange="bindDateChange2">
+            <picker mode="date" value="{{date2}}" start="1800-01-01" end="{{end}}" bindchange="bindDateChange2">
                 <view class="picker">
                    {{date2}}
                 </view>
@@ -28,31 +26,8 @@
             </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>