From f07302d44305007a051777812a8f6ca246fe73da Mon Sep 17 00:00:00 2001
From: 1191151619 <1191151619@qq.com>
Date: Tue, 3 Aug 2021 14:58:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=B0=E5=9B=BE=E5=9B=9E?=
 =?UTF-8?q?=E5=88=B0=E4=BB=8A=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/calendar/calendar.js   | 13 ++++++++++++-
 pages/calendar/calendar.wxml |  9 +++++++--
 pages/calendar/calendar.wxss | 11 ++++++++++-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/pages/calendar/calendar.js b/pages/calendar/calendar.js
index 667fd6d..ea691ec 100644
--- a/pages/calendar/calendar.js
+++ b/pages/calendar/calendar.js
@@ -204,5 +204,16 @@ Page({
   },
   calendarSelectedDate(e) {
     console.log(e)
-  }
+  },
+
+  // 回到今天
+  todayFun(){
+    this.setData({
+      year: moment().format('YYYY'),
+      month:moment().format('MM'),
+      timer : moment().format('YYYY-MM-DD'),
+      calendarDisplayTime: moment().format('YYYY-MM-DD'),
+    })
+    this.onShow();
+  },
 })
\ No newline at end of file
diff --git a/pages/calendar/calendar.wxml b/pages/calendar/calendar.wxml
index eb3491b..e6adacf 100644
--- a/pages/calendar/calendar.wxml
+++ b/pages/calendar/calendar.wxml
@@ -46,14 +46,19 @@
         </view>
       </view>
     </view>
-    <view class="tab">
-      <view class="tab-item {{item.id===active?'active':''}}" wx:for="{{tabList}}" wx:for-index="i" wx:for-item="item"
+    <view class="tab ">
+      <view class="tag_ul">
+        <view class="tab-item {{item.id===active?'active':''}}" wx:for="{{tabList}}" wx:for-index="i" wx:for-item="item"
         wx:key="id" bindtap="tabDowm" data-id="{{item.id}}">
         <view class="tab-title">
           {{item.name}} ({{item.id == 1?info.length:infoT.length}})
         </view>
         <image class="tab-tag" src="../../assets/images/tab-tag.png"></image>
       </view>
+      </view>
+      <view class="today" bindtap="todayFun">
+        回到今天
+      </view>
     </view>
     <!-- 展示部分 -->
     <view wx:if="{{active == 1}}">
diff --git a/pages/calendar/calendar.wxss b/pages/calendar/calendar.wxss
index 06305ba..ffd7d7a 100644
--- a/pages/calendar/calendar.wxss
+++ b/pages/calendar/calendar.wxss
@@ -112,8 +112,17 @@
   display: flex;
   align-items: center;
   padding: 0 30rpx;
+  justify-content: space-between;
+}
+.tag_ul{
+  display: flex;
+  align-items: center;
+}
+.today{
+  font-size: 24rpx;
+  font-weight: bold;
+  color:#136AE7;
 }
-
 .tab-item {
   display: flex;
   flex-direction: column;