From 24254a7d2c84d97298778dae5cd409ad582bc9ca Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Thu, 2 Jan 2020 16:37:39 +0800
Subject: [PATCH] fix(Calendar): incorrect day offset (#5452)

---
 src/calendar/components/Month.js              |  3 +--
 .../test/__snapshots__/demo.spec.js.snap      |  8 +++----
 .../test/__snapshots__/index.spec.js.snap     | 24 +++++++++----------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/calendar/components/Month.js b/src/calendar/components/Month.js
index d9a0b65d8..225f4d4dc 100644
--- a/src/calendar/components/Month.js
+++ b/src/calendar/components/Month.js
@@ -30,8 +30,7 @@ export default createComponent({
     },
 
     offset() {
-      const day = this.date.getDay();
-      return day > 0 ? day - 1 : 6;
+      return this.date.getDay();
     },
 
     totalDay() {
diff --git a/src/calendar/test/__snapshots__/demo.spec.js.snap b/src/calendar/test/__snapshots__/demo.spec.js.snap
index 2a72041eb..91fd51db7 100644
--- a/src/calendar/test/__snapshots__/demo.spec.js.snap
+++ b/src/calendar/test/__snapshots__/demo.spec.js.snap
@@ -52,10 +52,10 @@ exports[`renders demo correctly 1`] = `
         <div class="van-calendar__weekdays"><span class="van-calendar__weekday">日</span><span class="van-calendar__weekday">一</span><span class="van-calendar__weekday">二</span><span class="van-calendar__weekday">三</span><span class="van-calendar__weekday">四</span><span class="van-calendar__weekday">五</span><span class="van-calendar__weekday">六</span></div>
       </div>
       <div class="van-calendar__body">
-        <div class="van-calendar__month" style="padding-bottom: 384px;">
+        <div class="van-calendar__month" style="padding-bottom: 320px;">
           <div class="van-calendar__days">
             <div class="van-calendar__month-mark">1</div>
-            <div class="van-calendar__day van-calendar__day--disabled" style="margin-left: 85.71428571428571%;">1</div>
+            <div class="van-calendar__day van-calendar__day--disabled" style="margin-left: 0%;">1</div>
             <div class="van-calendar__day van-calendar__day--disabled">2</div>
             <div class="van-calendar__day van-calendar__day--disabled">3</div>
             <div class="van-calendar__day van-calendar__day--disabled">4</div>
@@ -94,7 +94,7 @@ exports[`renders demo correctly 1`] = `
           <div class="van-calendar__month-title">2012年2月</div>
           <div class="van-calendar__days">
             <div class="van-calendar__month-mark">2</div>
-            <div class="van-calendar__day van-calendar__day" style="margin-left: 28.571428571428573%;">1</div>
+            <div class="van-calendar__day van-calendar__day" style="margin-left: 42.857142857142854%;">1</div>
             <div class="van-calendar__day van-calendar__day">2</div>
             <div class="van-calendar__day van-calendar__day">3</div>
             <div class="van-calendar__day van-calendar__day">4</div>
@@ -129,7 +129,7 @@ exports[`renders demo correctly 1`] = `
           <div class="van-calendar__month-title">2012年3月</div>
           <div class="van-calendar__days">
             <div class="van-calendar__month-mark">3</div>
-            <div class="van-calendar__day van-calendar__day" style="margin-left: 42.857142857142854%;">1</div>
+            <div class="van-calendar__day van-calendar__day" style="margin-left: 57.142857142857146%;">1</div>
             <div class="van-calendar__day van-calendar__day">2</div>
             <div class="van-calendar__day van-calendar__day">3</div>
             <div class="van-calendar__day van-calendar__day">4</div>
diff --git a/src/calendar/test/__snapshots__/index.spec.js.snap b/src/calendar/test/__snapshots__/index.spec.js.snap
index cfbd27976..763f5a7e1 100644
--- a/src/calendar/test/__snapshots__/index.spec.js.snap
+++ b/src/calendar/test/__snapshots__/index.spec.js.snap
@@ -8,10 +8,10 @@ exports[`color prop when type is range 1`] = `
     <div class="van-calendar__weekdays"><span class="van-calendar__weekday">日</span><span class="van-calendar__weekday">一</span><span class="van-calendar__weekday">二</span><span class="van-calendar__weekday">三</span><span class="van-calendar__weekday">四</span><span class="van-calendar__weekday">五</span><span class="van-calendar__weekday">六</span></div>
   </div>
   <div class="van-calendar__body">
-    <div class="van-calendar__month" style="padding-bottom: 320px;">
+    <div class="van-calendar__month" style="padding-bottom: 384px;">
       <div class="van-calendar__days">
         <div class="van-calendar__month-mark">1</div>
-        <div class="van-calendar__day van-calendar__day--disabled" style="margin-left: 57.142857142857146%;">1</div>
+        <div class="van-calendar__day van-calendar__day--disabled" style="margin-left: 71.42857142857143%;">1</div>
         <div class="van-calendar__day van-calendar__day--disabled">2</div>
         <div class="van-calendar__day van-calendar__day--disabled">3</div>
         <div class="van-calendar__day van-calendar__day--disabled">4</div>
@@ -59,10 +59,10 @@ exports[`color prop when type is single 1`] = `
     <div class="van-calendar__weekdays"><span class="van-calendar__weekday">日</span><span class="van-calendar__weekday">一</span><span class="van-calendar__weekday">二</span><span class="van-calendar__weekday">三</span><span class="van-calendar__weekday">四</span><span class="van-calendar__weekday">五</span><span class="van-calendar__weekday">六</span></div>
   </div>
   <div class="van-calendar__body">
-    <div class="van-calendar__month" style="padding-bottom: 320px;">
+    <div class="van-calendar__month" style="padding-bottom: 384px;">
       <div class="van-calendar__days">
         <div class="van-calendar__month-mark">1</div>
-        <div class="van-calendar__day van-calendar__day--disabled" style="margin-left: 57.142857142857146%;">1</div>
+        <div class="van-calendar__day van-calendar__day--disabled" style="margin-left: 71.42857142857143%;">1</div>
         <div class="van-calendar__day van-calendar__day--disabled">2</div>
         <div class="van-calendar__day van-calendar__day--disabled">3</div>
         <div class="van-calendar__day van-calendar__day--disabled">4</div>
@@ -110,10 +110,10 @@ exports[`formatter prop 1`] = `
     <div class="van-calendar__weekdays"><span class="van-calendar__weekday">日</span><span class="van-calendar__weekday">一</span><span class="van-calendar__weekday">二</span><span class="van-calendar__weekday">三</span><span class="van-calendar__weekday">四</span><span class="van-calendar__weekday">五</span><span class="van-calendar__weekday">六</span></div>
   </div>
   <div class="van-calendar__body">
-    <div class="van-calendar__month" style="padding-bottom: 320px;">
+    <div class="van-calendar__month" style="padding-bottom: 384px;">
       <div class="van-calendar__days">
         <div class="van-calendar__month-mark">1</div>
-        <div class="van-calendar__day van-calendar__day--disabled" style="margin-left: 57.142857142857146%;">1</div>
+        <div class="van-calendar__day van-calendar__day--disabled" style="margin-left: 71.42857142857143%;">1</div>
         <div class="van-calendar__day van-calendar__day--disabled">2</div>
         <div class="van-calendar__day van-calendar__day--disabled">3</div>
         <div class="van-calendar__day van-calendar__day--disabled">4</div>
@@ -167,10 +167,10 @@ exports[`popup wrapper 2`] = `
       <div class="van-calendar__weekdays"><span class="van-calendar__weekday">日</span><span class="van-calendar__weekday">一</span><span class="van-calendar__weekday">二</span><span class="van-calendar__weekday">三</span><span class="van-calendar__weekday">四</span><span class="van-calendar__weekday">五</span><span class="van-calendar__weekday">六</span></div>
     </div>
     <div class="van-calendar__body">
-      <div class="van-calendar__month" style="padding-bottom: 320px;">
+      <div class="van-calendar__month" style="padding-bottom: 384px;">
         <div class="van-calendar__days">
           <div class="van-calendar__month-mark">1</div>
-          <div class="van-calendar__day van-calendar__day--disabled" style="margin-left: 57.142857142857146%;">1</div>
+          <div class="van-calendar__day van-calendar__day--disabled" style="margin-left: 71.42857142857143%;">1</div>
           <div class="van-calendar__day van-calendar__day--disabled">2</div>
           <div class="van-calendar__day van-calendar__day--disabled">3</div>
           <div class="van-calendar__day van-calendar__day--disabled">4</div>
@@ -220,10 +220,10 @@ exports[`row-height prop 1`] = `
     <div class="van-calendar__weekdays"><span class="van-calendar__weekday">日</span><span class="van-calendar__weekday">一</span><span class="van-calendar__weekday">二</span><span class="van-calendar__weekday">三</span><span class="van-calendar__weekday">四</span><span class="van-calendar__weekday">五</span><span class="van-calendar__weekday">六</span></div>
   </div>
   <div class="van-calendar__body">
-    <div class="van-calendar__month" style="padding-bottom: 250px;">
+    <div class="van-calendar__month" style="padding-bottom: 300px;">
       <div class="van-calendar__days">
         <div class="van-calendar__month-mark">1</div>
-        <div class="van-calendar__day van-calendar__day--disabled" style="margin-left: 57.142857142857146%; height: 50px;">1</div>
+        <div class="van-calendar__day van-calendar__day--disabled" style="margin-left: 71.42857142857143%; height: 50px;">1</div>
         <div class="van-calendar__day van-calendar__day--disabled" style="height: 50px;">2</div>
         <div class="van-calendar__day van-calendar__day--disabled" style="height: 50px;">3</div>
         <div class="van-calendar__day van-calendar__day--disabled" style="height: 50px;">4</div>
@@ -271,10 +271,10 @@ exports[`title & footer slot 1`] = `
     <div class="van-calendar__weekdays"><span class="van-calendar__weekday">日</span><span class="van-calendar__weekday">一</span><span class="van-calendar__weekday">二</span><span class="van-calendar__weekday">三</span><span class="van-calendar__weekday">四</span><span class="van-calendar__weekday">五</span><span class="van-calendar__weekday">六</span></div>
   </div>
   <div class="van-calendar__body">
-    <div class="van-calendar__month" style="padding-bottom: 320px;">
+    <div class="van-calendar__month" style="padding-bottom: 384px;">
       <div class="van-calendar__days">
         <div class="van-calendar__month-mark">1</div>
-        <div class="van-calendar__day van-calendar__day--disabled" style="margin-left: 57.142857142857146%;">1</div>
+        <div class="van-calendar__day van-calendar__day--disabled" style="margin-left: 71.42857142857143%;">1</div>
         <div class="van-calendar__day van-calendar__day--disabled">2</div>
         <div class="van-calendar__day van-calendar__day--disabled">3</div>
         <div class="van-calendar__day van-calendar__day--disabled">4</div>