From bc6e14e94dc30ee0bf6e157af91f90e4a83c6d9c Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 23 Jun 2021 15:30:27 +0800
Subject: [PATCH] no message

---
 components/calendar/calendar.wxml | 4 ++--
 components/calendar/index.wxss    | 2 +-
 pages/index/index.js              | 2 +-
 pages/process/index/index.wxml    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/calendar/calendar.wxml b/components/calendar/calendar.wxml
index eedb8ec..5690299 100644
--- a/components/calendar/calendar.wxml
+++ b/components/calendar/calendar.wxml
@@ -1,9 +1,9 @@
-<view class="van-calendar">
+<view class="van-calendar" style="height:750rpx">
   <header title="{{ title }}" showTitle="{{ showTitle }}" subtitle="{{ subtitle }}" showSubtitle="{{ showSubtitle }}">
     <slot name="title" slot="title"></slot>
   </header>
 
-  <scroll-view class="van-calendar__body" scroll-y scroll-into-view="{{ scrollIntoView }}" scroll-top="{{ top }}">
+  <scroll-view class="van-calendar__body" style="height:600rpx" scroll-y 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 }}" index="{{ index }}" minDate="{{ minDate }}"
       maxDate="{{ maxDate }}" showMark="{{ showMark }}" formatter="{{ formatter }}" rowHeight="{{ rowHeight }}"
diff --git a/components/calendar/index.wxss b/components/calendar/index.wxss
index 1558a52..0aa05d9 100644
--- a/components/calendar/index.wxss
+++ b/components/calendar/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-calendar{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;height:100%;height:var(--calendar-height,100%);background-color:#fff;background-color:var(--calendar-background-color,#fff)}.van-calendar__close-icon{top:11px}.van-calendar__popup--bottom,.van-calendar__popup--top{height:60%;height:var(--calendar-popup-height,60%)}.van-calendar__popup--left,.van-calendar__popup--right{height:100%}.van-calendar__body{-webkit-flex:1;flex:1;overflow:auto;-webkit-overflow-scrolling:touch}.van-calendar__footer{-webkit-flex-shrink:0;flex-shrink:0;padding:0 16px;padding:0 var(--padding-md,16px)}.van-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.van-calendar__footer+.van-calendar__footer,.van-calendar__footer:empty{display:none}.van-calendar__footer:empty+.van-calendar__footer{display:block!important}.van-calendar__confirm{height:36px!important;height:var(--calendar-confirm-button-height,36px)!important;margin:7px 0!important;margin:var(--calendar-confirm-button-margin,7px 0)!important;line-height:34px!important;line-height:var(--calendar-confirm-button-line-height,34px)!important}
\ No newline at end of file
+@import '../common/index.wxss';.van-calendar{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;height:100%;height:var(--calendar-height,100%);background-color:#fff;background-color:var(--calendar-background-color,#fff)}.van-calendar__close-icon{top:11px}.van-calendar__popup--bottom,.van-calendar__popup--top{height:750rpx;height:var(--calendar-popup-height,750rpx)}.van-calendar__popup--left,.van-calendar__popup--right{height:100%}.van-calendar__body{-webkit-flex:1;flex:1;overflow:auto;-webkit-overflow-scrolling:touch}.van-calendar__footer{-webkit-flex-shrink:0;flex-shrink:0;padding:0 16px;padding:0 var(--padding-md,16px)}.van-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.van-calendar__footer+.van-calendar__footer,.van-calendar__footer:empty{display:none}.van-calendar__footer:empty+.van-calendar__footer{display:block!important}.van-calendar__confirm{height:36px!important;height:var(--calendar-confirm-button-height,36px)!important;margin:7px 0!important;margin:var(--calendar-confirm-button-margin,7px 0)!important;line-height:34px!important;line-height:var(--calendar-confirm-button-line-height,34px)!important}
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index f485bdb..f2b5387 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -85,7 +85,7 @@ Scene({
       factoryName:  app.userInfo.factoryName,
       arrow: this.data.arrow,
       customBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 60),
-      fragment: (app.globalData.safeFragmentHeight + app.globalData.statusBarHeight) - 100, 
+      fragment: app.globalData.safeFragmentHeight, 
       safeBottom: app.globalData.safeBottom
     })
     event.on('EventMessage', this, this.onEvent)
diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml
index dfef3de..617c857 100644
--- a/pages/process/index/index.wxml
+++ b/pages/process/index/index.wxml
@@ -109,5 +109,5 @@
 
 <van-calendar show="{{ show }}" type="range" row-height="50" color="#008AFF" z-index="22" min-date="{{ minDate }}" max-date="{{ maxDate }}" default-date="{{ vdate }}" title="日期范围选择" show-subtitle="{{ false }}" show-confirm="{{ false }}" bind:close="onClose" bind:confirm="onSelect"/>
 
-<van-action-sheet show="{{ sheet }}" actions="{{ actions }}" bind:cancel="onCancel" bind:close="onClose"
+<van-action-sheet show="{{ sheet }}" actions="{{ actions }}" bind:cancel="onClose" bind:close="onClose"
   bind:select="onAction" cancel-text="取消" z-index="22" />
\ No newline at end of file