From daa5aa94216fa72209cb1197bc07577bb68c1a7a Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Wed, 16 Apr 2025 15:15:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/auth/primary.vue                   | 5 +++--
 wxcomponents/vant/calendar/calendar.vue  | 4 ++--
 wxcomponents/vant/calendar/calendar.wxml | 4 ++--
 wxcomponents/vant/calendar/index.json    | 2 +-
 wxcomponents/vant/calendar/index.vue     | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pages/auth/primary.vue b/pages/auth/primary.vue
index 7616efa..c07dde8 100644
--- a/pages/auth/primary.vue
+++ b/pages/auth/primary.vue
@@ -22,11 +22,12 @@
 	     />
 	   </view>
 	  </view>
-	  <view class="form-item border-b p-md m-b-md">
+	  <view class="form-item border-b p-md m-b-md" v-if="0">
 	    <view class="label m-b-xs">{{$t('auth.d0')}}</view>
 	    <view class="input color-light">
-	      <uni-datetime-picker type="date" :placeholder="$t('common.c8')" start="1873-1-01" :end="new Date()"
+	      <uni-datetime-picker type="date" :placeholder="$t('common.c8')" start="1873-1-01" :end="new Date().getTime()"
 		  :clear-icon="false" v-model="form.birthday" />
+		  
 		  <!-- .toLocaleDateString() -->
 	    </view>
 	  </view>
diff --git a/wxcomponents/vant/calendar/calendar.vue b/wxcomponents/vant/calendar/calendar.vue
index ae5b251..a0ccd0b 100644
--- a/wxcomponents/vant/calendar/calendar.vue
+++ b/wxcomponents/vant/calendar/calendar.vue
@@ -1,9 +1,9 @@
 <template>
 <uni-shadow-root class="vant-calendar-calendar"><template v-if="wxTemplateName === 'calendar'">
   <view class="van-calendar">
-    <header :title="title" :showTitle="showTitle" :subtitle="subtitle" :showSubtitle="showSubtitle">
+    <vanheader :title="title" :showTitle="showTitle" :subtitle="subtitle" :showSubtitle="showSubtitle">
       <slot name="title" slot="title"></slot>
-    </header>
+    </vanheader>
 
     <scroll-view class="van-calendar__body" scroll-y :scroll-into-view="scrollIntoView">
       <month v-for="(item,index) in (computed.getMonths(minDate, maxDate))" :key="item.index" :id="'month'+(index)" class="month" :data-date="item" :date="item" :type="type" :color="color" :minDate="minDate" :maxDate="maxDate" :showMark="showMark" :formatter="formatter" :rowHeight="rowHeight" :currentDate="currentDate" :showSubtitle="showSubtitle" :allowSameDay="allowSameDay" :showMonthTitle="index !== 0 || !showSubtitle" @click="_$self.$parent.$parent[('onClickDay')]($event)"></month>
diff --git a/wxcomponents/vant/calendar/calendar.wxml b/wxcomponents/vant/calendar/calendar.wxml
index 09a60b3..cced2c1 100644
--- a/wxcomponents/vant/calendar/calendar.wxml
+++ b/wxcomponents/vant/calendar/calendar.wxml
@@ -2,14 +2,14 @@
 
 <template name="calendar">
   <view class="van-calendar">
-    <header
+    <vanheader
       title="{{ title }}"
       showTitle="{{ showTitle }}"
       subtitle="{{ subtitle }}"
       showSubtitle="{{ showSubtitle }}"
     >
       <slot name="title" slot="title"></slot>
-    </header>
+    </vanheader>
 
     <scroll-view class="van-calendar__body" scroll-y scroll-into-view="{{ scrollIntoView }}">
       <month
diff --git a/wxcomponents/vant/calendar/index.json b/wxcomponents/vant/calendar/index.json
index 397d5ae..abd28ec 100644
--- a/wxcomponents/vant/calendar/index.json
+++ b/wxcomponents/vant/calendar/index.json
@@ -1,7 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "header": "./components/header/index",
+    "vanheader": "./components/header/index",
     "month": "./components/month/index",
     "van-button": "../button/index",
     "van-popup": "../popup/index",
diff --git a/wxcomponents/vant/calendar/index.vue b/wxcomponents/vant/calendar/index.vue
index 1c1dc54..b6ca966 100644
--- a/wxcomponents/vant/calendar/index.vue
+++ b/wxcomponents/vant/calendar/index.vue
@@ -13,12 +13,12 @@
 const __wxTemplateComponentProps = {"calendar":["wxTemplateName","title","subtitle","showTitle","showSubtitle","minDate","maxDate","type","color","showMark","formatter","rowHeight","currentDate","safeAreaInsetBottom","showConfirm","confirmDisabledText","confirmText","scrollIntoView","allowSameDay"]}
 import __wxTemplateComponent0 from './calendar.vue'
 __wxTemplateComponentProps['calendar'] && __wxTemplateComponentProps['calendar'].forEach(prop => __wxTemplateComponent0.props[prop] = {type: null})
-import Header from './components/header/index.vue'
+import Vanheader from './components/header/index.vue'
 import Month from './components/month/index.vue'
 import VanButton from '../button/index.vue'
 import VanPopup from '../popup/index.vue'
 import VanToast from '../toast/index.vue'
-global['__wxVueOptions'] = {components:{'header': Header,'month': Month,'van-button': VanButton,'van-popup': VanPopup,'van-toast': VanToast,'calendar' : __wxTemplateComponent0}}
+global['__wxVueOptions'] = {components:{'vanheader': Vanheader,'month': Month,'van-button': VanButton,'van-popup': VanPopup,'van-toast': VanToast,'calendar' : __wxTemplateComponent0}}
 
 global['__wxRoute'] = 'vant/calendar/index'
 import { VantComponent } from '../common/component';