From aa7a5391e0c126551f0fd72c3b71fb410888aefb Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 2 Apr 2021 14:57:49 +0800
Subject: [PATCH] no message

---
 components/calendar/calendar.wxml               | 4 ++--
 components/calendar/components/month/index.js   | 5 +++++
 components/calendar/components/month/index.wxml | 2 +-
 components/calendar/index.js                    | 4 ++++
 pages/process/agent-list/index.js               | 1 -
 pages/process/index/index.wxml                  | 4 ++--
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/components/calendar/calendar.wxml b/components/calendar/calendar.wxml
index a9d50cb..c89e174 100644
--- a/components/calendar/calendar.wxml
+++ b/components/calendar/calendar.wxml
@@ -3,9 +3,9 @@
     <slot name="title" slot="title"></slot>
   </header>
 
-  <scroll-view class="van-calendar__body" scroll-y scroll-into-view="{{ scrollIntoView }}">
+  <scroll-view class="van-calendar__body" scroll-y="true" scroll-into-view="{{ scrollIntoView }}" scroll-top="{{ top }}">
     <month wx:for="{{ computed.getMonths(minDate, maxDate) }}" wx:key="index" id="month{{ index }}" class="month"
-      data-date="{{ item }}" date="{{ item }}" type="{{ type }}" color="{{ color }}" minDate="{{ minDate }}"
+      data-date="{{ item }}" date="{{ item }}" type="{{ type }}" color="{{ color }}" index="{{ index }}" minDate="{{ minDate }}"
       maxDate="{{ maxDate }}" showMark="{{ showMark }}" formatter="{{ formatter }}" rowHeight="{{ rowHeight }}"
       currentDate="{{ currentDate }}" showSubtitle="{{ showSubtitle }}" allowSameDay="{{ allowSameDay }}"
       showMonthTitle="{{ index !== 0 || !showSubtitle }}" bind:click="onClickDay" />
diff --git a/components/calendar/components/month/index.js b/components/calendar/components/month/index.js
index 4c872a9..439542a 100644
--- a/components/calendar/components/month/index.js
+++ b/components/calendar/components/month/index.js
@@ -7,6 +7,10 @@ import {
 } from '../../utils';
 VantComponent({
   props: {
+    index: {
+      type: Number,
+      value: '',
+    },
     date: {
       type: null,
       observer: 'setDays',
@@ -51,6 +55,7 @@ VantComponent({
       }
     },
     setDays() {
+      // console.log(this.data.index)
       const days = [];
       const startDate = new Date(this.data.date);
       const year = startDate.getFullYear();
diff --git a/components/calendar/components/month/index.wxml b/components/calendar/components/month/index.wxml
index 55bab83..601ecef 100644
--- a/components/calendar/components/month/index.wxml
+++ b/components/calendar/components/month/index.wxml
@@ -1,7 +1,7 @@
 <wxs src="./index.wxs" module="computed"></wxs>
 <wxs src="../../../wxs/utils.wxs" module="utils" />
 
-<view class="van-calendar__month" style="{{ computed.getMonthStyle(visible, date, rowHeight) }}">
+<view class="van-calendar__month" style="{{ computed.getMonthStyle(visible, date, rowHeight) }}" id="month{{ index }}">
   <view wx:if="{{ showMonthTitle }}" class="van-calendar__month-title">
     {{ computed.formatMonthTitle(date) }}
   </view>
diff --git a/components/calendar/index.js b/components/calendar/index.js
index 779d0ff..06112e6 100644
--- a/components/calendar/index.js
+++ b/components/calendar/index.js
@@ -104,6 +104,10 @@ VantComponent({
       type: null,
       value: null,
     },
+    top: {
+      type: Number,
+      value: 0,
+    }
   },
   data: {
     subtitle: '',
diff --git a/pages/process/agent-list/index.js b/pages/process/agent-list/index.js
index af4c40c..3fe2ca2 100644
--- a/pages/process/agent-list/index.js
+++ b/pages/process/agent-list/index.js
@@ -55,7 +55,6 @@ Page({
     } else {
       this.setData({ requesting: true })
     }
-    console.log('getAgentOrderList======67')
     getAgentOrderList(this.data.form).then(result => {
       if (result.data && result.data.records.length) {
         var respList = result.data.records
diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml
index 7e84e1e..6b4daef 100644
--- a/pages/process/index/index.wxml
+++ b/pages/process/index/index.wxml
@@ -16,7 +16,7 @@
     <view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx 8rpx 0rpx">
       <view class="flex flex-justify" style="padding: 0rpx 28rpx 24rpx 28rpx">
         <view class="text-black text-sg text-bold">收货统计</view>
-        <view class="flex flex-center" bindtap="showSheet">
+        <view class="flex flex-center" bindtap="showSheet" style="padding: 2rpx 0rpx">
           <view class="text-black text-sm" style="margin-right:8rpx">{{vdateString}}</view>
           <van-icon name="arrow-down" />
         </view>
@@ -131,4 +131,4 @@
 </scroll-view>
 
 <!-- <van-action-sheet show="{{ show }}" actions="{{ actions }}" bind:close="onClose" bind:select="onSelect" z-index="22"/> -->
-<van-calendar show="{{ show }}" type="range" row-height="50" color="#008AFF" z-index="22" min-date="{{ minDate }}" max-date="{{ maxDate }}" default-date="{{ vdate }}" show-subtitle="{{ false }}" show-confirm="{{ false }}" bind:close="onClose" bind:confirm="onSelect"/>
\ No newline at end of file
+<van-calendar show="{{ show }}" type="range" row-height="50" color="#008AFF" z-index="22" min-date="{{ minDate }}" max-date="{{ maxDate }}" default-date="{{ vdate }}" top="{{ 1500 }}" show-subtitle="{{ false }}" show-confirm="{{ false }}" bind:close="onClose" bind:confirm="onSelect"/>
\ No newline at end of file