diff --git a/.DS_Store b/.DS_Store
index ca2f2aa..2a302a8 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/pages.json b/pages.json
index fe8c4d6..6ace7f2 100644
--- a/pages.json
+++ b/pages.json
@@ -268,7 +268,7 @@
"path": "pages/sign/index",
"name": "signIndex",
"style": {
- "navigationBarTitleText": "每日签到",
+ "navigationBarTitleText": "每日打卡",
"navigationBarBackgroundColor": "#FFFFFF"
}
},
diff --git a/pages/.DS_Store b/pages/.DS_Store
index 83144c2..2c2ce98 100644
Binary files a/pages/.DS_Store and b/pages/.DS_Store differ
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8ad47fd..96857a8 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -4,7 +4,15 @@
欢迎使用ZH-HEALTH健康
-
+
+
+
+
+
+ 打卡
+
+
+
@@ -101,12 +109,29 @@
align-items: center;
.helloe {
line-height: 100rpx;
- font-size: $title-size + 10;
+ font-size: $title-size + 4;
font-weight: bold;
}
.btns {
margin-left: $margin;
display: flex;
+ .btns-clock {
+ color: #885100;
+ height: 50rpx;
+ font-size: $title-size-sm - 2;
+ border-radius: 40rpx;
+ display: flex;
+ background-image: linear-gradient(to right, #fce938, #ffce36);
+ image {
+ width: 48rpx;
+ display: inline-block;
+ }
+ .btns-clock-text {
+ line-height: 50rpx;
+ font-weight: 600;
+ padding: 0 20rpx 0 8rpx;
+ }
+ }
.btns-item {
position: relative;
text-align: right;
diff --git a/pages/sign/index.vue b/pages/sign/index.vue
index 5ac3812..0addd22 100644
--- a/pages/sign/index.vue
+++ b/pages/sign/index.vue
@@ -9,7 +9,7 @@
{{ dateData.total }}天
- 本月签到
+ 本月打卡
@@ -18,7 +18,7 @@
{{ dateData.continue }}天
- 累计签到
+ 累计打卡
@@ -50,25 +50,28 @@
六
-
-
- {{ items.isSign ? '签' : items.date }}
+
+
+
+
+ {{ items.date }}
+
- {{ dateData.isSign ? '当日已签' : '立即签到'}}
+ {{ dateData.isSign ? '今日已打卡' : '今日打卡'}}
- ZH大健康用户签到
+ ZH大健康用户打卡
-
-
-
+
+
+
-
+ }
+
+
+
diff --git a/static/.DS_Store b/static/.DS_Store
index 61af3bd..9cef02d 100644
Binary files a/static/.DS_Store and b/static/.DS_Store differ
diff --git a/static/icon/clock_icon.png b/static/icon/clock_icon.png
new file mode 100644
index 0000000..43c4066
Binary files /dev/null and b/static/icon/clock_icon.png differ