同步代码

pages.json

@@ -268,7 +268,7 @@
             "path": "pages/sign/index",
             "name": "signIndex",
             "style": {
-                "navigationBarTitleText": "每日签到",
+                "navigationBarTitleText": "每日打卡",
                 "navigationBarBackgroundColor": "#FFFFFF"
             }
         },

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;

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;
+            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;
         }
     }
-            color: $text-gray-m;
+</style>