From 38361b4beab12caf9c664ec65b232d5f6beae5eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Tue, 8 Feb 2022 11:08:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                  | Bin 12292 -> 12292 bytes
 pages.json                 |   2 +-
 pages/.DS_Store            | Bin 10244 -> 10244 bytes
 pages/index/index.vue      |  29 ++++++++++++++++++++++--
 pages/sign/index.vue       |  44 +++++++++++++++++++++++--------------
 static/.DS_Store           | Bin 10244 -> 10244 bytes
 static/icon/clock_icon.png | Bin 0 -> 3393 bytes
 7 files changed, 56 insertions(+), 19 deletions(-)
 create mode 100644 static/icon/clock_icon.png

diff --git a/.DS_Store b/.DS_Store
index ca2f2aa60b403dcf06205b8707b4be0f84953c19..2a302a8794f4b5c8a10dbb656d9dac78105832bc 100644
GIT binary patch
delta 51
zcmZokXi1ph&ltTiV7EM@(PkcnvrL;=m0z$-J}B<CnO)->3rlfszRP5PRr$?6stcKb
G!p;EXMG{5;

delta 79
zcmZokXi1ph&ls~YV7EM@@n#-{vrHOn3|S1t4Dmpm!jSEmlb@WFlb^)Ez#zcDz$go(
d_5Ona!{)0>Z&)_JRTp60d{N~C)8x0};sEC_8>j#P

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 83144c2e66005ec118d2ffc10146830fb1d3af22..2c2ce98012af140ebbd8049f9c2ae39e641fad60 100644
GIT binary patch
delta 277
zcmZn(XbG6$&*--?U^hRb-)0_xXH4};<;4X_Ir&Kp3=Aie3UV@wOAHLIGcqx=u(Gjp
zaBy*O@p8omXXKX$mn4>y7CR*tMT2+&i6t3HP<BXueh!?Sm=u<oS{^ST;+&sXl9-v7
zS_IadnUV@r5)+=8my%!ZlwX>cQVcdHI1D1g!NJMF880AFU2SG$q@!SBVN|Q5P;F^s
z0Aw4R)z)%yh^rdfdM4ynR#n&3*3AUE76=#_Av6O&l!j5WCO;8s7H4J1WXNMkVMt}D
eC<`vi%gN762Wi@zBD{=yGrPhsmdz|8%*+5srcV+8

delta 41
zcmV+^0M`G6P=rvBPXSD^P`eKSOtTCS<^q$|6Lqs>6r&4~fc>)vAo>Ke{uKiQPZ$s%

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 @@
 			<view class="status-main">
 				<view class="helloe">欢迎使用ZH-HEALTH健康</view>
 				<view class="btns">
-					<view class="btns-item" @click="onBtn('signIndex')"><image src="@/static/icon/sign-icon.gif" mode="widthFix"></image></view>
+                    <!-- 打卡图标gif -->
+                    <!-- <view class="btns-item" @click="$Router.push({name: 'signIndex'})"><image src="@/static/icon/sign-icon.gif" mode="widthFix"></image></view> -->
+                    <view class="btns-clock" @click="$Router.push({name: 'signIndex'})">
+                        <image src="@/static/icon/clock_icon.png" mode="widthFix"></image>
+                        <view class="btns-clock-text">
+                            打卡
+                        </view>
+                    </view>
+                    
 					<view class="btns-item show" @click="onBtn('noticeIndex')"><uni-icons custom-prefix="iconfont" type="icon-pinglun" size="25"></uni-icons></view>
 				</view>
 			</view>
@@ -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 @@
                         <view class="number">
                             <text>{{ dateData.total }}</text>天
                         </view>
-                        本月签到
+                        本月打卡
                     </view>
                 </view>
                 <view class="label">
@@ -18,7 +18,7 @@
                         <view class="number">
                             <text>{{ dateData.continue }}</text>天
                         </view>
-                        累计签到
+                        累计打卡
                     </view>
                 </view>
             </view>
@@ -50,25 +50,28 @@
                             六
                         </view>
                     </view>
-                    <view class="day" v-for="(item, index) in dateArr">
-                        <view class="day-label" v-for="(items, index) in item">
-                            <view class="label-block" :class="{active : items.isSign}" v-if="!items.isHidden">{{ items.isSign ? '签' : items.date }}</view>
+                    <view class="day" v-for="(item, index) in dateArr" :key="index">
+                        <view class="day-label" v-for="(items, index) in item" :key="index">
+                            <view class="label-block" :class="{active : items.isSign}" v-if="!items.isHidden">
+                                <uni-icons v-if="items.isSign" class="search-icon" custom-prefix="iconfont" type="icon-dui" color="#ffffff" size="18"></uni-icons>
+                                <block v-else>{{ items.date }}</block>
+                            </view>
                         </view>
                     </view>
                 </view>
                 <view class="signBtn">
                     <view class="btn" @click="signClick" :class="{active : dateData.isSign}">
-                        {{ dateData.isSign ? '当日已签' : '立即签到'}}
+                        {{ dateData.isSign ? '今日已打卡' : '今日打卡'}}
                     </view>
                 </view>
             </view>
             <view class="tipsText">
-                ZH大健康用户签到
+                ZH大健康用户打卡
             </view>
         </view>
-    </view>
-</template>
-
+    </view>
+</template>
+
 <script>
     import { date, sign } from '@/apis/interfaces/sign'
     export default {
@@ -112,9 +115,9 @@
                 })
             }
     	}
-    }
-</script>
-
+    }
+</script>
+
 <style lang="scss" scoped>
     page {
         background: $window-color;
@@ -174,7 +177,9 @@
             }
         }
         .signDate {
-            padding: $padding;
            border-radius: $radius-m;
            background-color: white;
+            padding: $padding;
+            border-radius: $radius-m;
+            background-color: white;
             .date {
                 text-align: center;
                 font-size: $title-size + 6;
@@ -209,6 +214,12 @@
                             height: 56rpx;
                             line-height: 56rpx;
                             text-align: center;
+                            position: relative;
+                            .label-icon {
+                                position: absolute;
+                                left: 10rpx;
+                                top: 0;
+                            }
                             &.active {
                                 background-color: $main-color;
                                 color: white;
@@ -232,7 +243,8 @@
                         color: $text-gray;
                     }
                 }
-            }
        }
+            }
+        }
         
         .tipsText {
             text-align: center;
@@ -241,4 +253,4 @@
             color: $text-gray-m;
         }
     }
-</style>
+</style>
diff --git a/static/.DS_Store b/static/.DS_Store
index 61af3bdd7bcc51d72116b969c1fe3bdba080208a..9cef02d4feac8305cdf1df5756e8c53c40f8e6d2 100644
GIT binary patch
delta 39
vcmZn(XbIR*Dm2+gtd-SVN5Ry5lCa$5_W~-LorI6_Y-UsV%d(k8l#v+#2-yru

delta 51
zcmV-30L=e{P=rvhbrJ!|lh7A{3K)BPH90aYAT~0S{}LVnnUnAk9|4-PJ`>0cvj-sj
J1hWDa0R!Nf5jg+=

diff --git a/static/icon/clock_icon.png b/static/icon/clock_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..43c40664cc26a7f7706a738b2e7005c3ce71a6ca
GIT binary patch
literal 3393
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

literal 0
HcmV?d00001