签到

components/dkbase/dk-timeclock-calendar/dk-timeclock-calendar.js

@@ -9,7 +9,7 @@ Component({
       },
       isopenshow: {
         type: [Boolean],
-        value: [true]
+        value: [false]
       },
       open: {
         type: [Boolean],
@@ -187,6 +187,7 @@ Component({
         this.setData({
           dateList: this.data.dateList
         })
+        console.log(this.data.dateList);
       },
       //日历主体的渲染方法
       dateInit(setYear = this.data.selectDay.year, setMonth = this.data.selectDay.month) {

components/dkbase/dk-timeclock-calendar/dk-timeclock-calendar.wxml

@@ -3,7 +3,9 @@
 	<view class="title flex">
 		<view class="flex">
 			<picker value="{{selectDay.year+'-'+selectDay.month}}" bindchange="editMonth" mode="date" fields="month"
-				class="year-month">{{selectDay.year}}.{{selectDay.month>9?selectDay.month:"0"+selectDay.month}}</picker>
+				class="year-month">{{selectDay.year}}.{{selectDay.month>9?selectDay.month:"0"+selectDay.month}}</picker>			
+		</view>
+		<view   class="flex open"  >			 
 			<view class="icon" bindtap="lastMonth" style="transform:rotate(180deg);">
 				<view class="iconfont icon-playfill"></view>
 			</view>
@@ -11,10 +13,6 @@
 				<view class="iconfont icon-playfill"></view>
 			</view>
 		</view>
-		<view catchtap="openChange" class="flex open" wx:if="{{isopenshow}}">
-			<view>{{open?"收起":"展开"}}</view>
-			<view style="margin-left:6rpx;font-size:20rpx" class="iconfont icon-{{open?'fold':'unfold'}}"></view>
-		</view>
 	</view>
 
 	<!-- 日历头部 -->
@@ -29,7 +27,7 @@
 	</view>
 
 	<!-- 日历主体 -->
-	<view class="flex-start flex-wrap calendar-main" style="height:{{dateList.length/7*72}}rpx">
+	<view class="flex-start flex-wrap calendar-main" style="height:{{dateList.length/7*89}}rpx;  ">
 		<view wx:for="{{dateList}}" wx:key="dateList" class="day">
 			<view
 				class="bg {{(item.year === selectDay.year && item.month === selectDay.month) ? (item.day === selectDay.day?'select':''): 'other-month'}}"
@@ -37,8 +35,9 @@
 				data-date-string="{{item.dateString}}">
 				{{item.day}}
 			</view>
-			<!--isnormal 0 正常 1 异常  -->
-			<view class="{{item.isnormal ? 'spot':'notnormalspot'}}" wx:if="{{item.spot}}">
+			<!--isnormal 0 正常 1 异常  wx:if="{{item.spot}}"-->
+			<view class="notnormalspot" style="{{'color:' + (item.isnormal?'#EBC07F':'#ac0909')}}">
+			漏签
 			</view>
 		</view>
 	</view>

components/dkbase/dk-timeclock-calendar/dk-timeclock-calendar.wxss

@@ -131,7 +131,7 @@
   }
   
   .calendar .calendar-main {
-	padding: 30rpx 2rpx;
+	padding: 20rpx 1rpx;
 	transition: height 0.3s;
 	align-content: flex-start;
 	overflow: hidden;
@@ -139,22 +139,22 @@
   
   .calendar .calendar-main .day {
 	position: relative;
-	width: 100rpx;
+	width: 14.2%;
 	color: #666;
-	text-align: center;
-	height: 72rpx;
+	text-align: center; 
+	height: 89rpx; 
   }
   
   .calendar .calendar-main .day .bg {
-	height: 56rpx;
-	line-height: 56rpx;
+	height: 66rpx;
+	line-height: 66rpx;
 	font-size: 28rpx;
-	color: #333;
+	color: #333; 
 	font-weight: bold;
   }
   
   .calendar .calendar-main .day .select {
-	width: 56rpx;
+	width: 66rpx;
 	border-radius: 50%;
 	text-align: center;
 	color: #fff;
@@ -165,20 +165,12 @@
   
   .calendar .calendar-main .day .other-month {
 	color: #ccc;
-  }
-  
-  .calendar .calendar-main .day .spot {
-	width: 8rpx;
-	height: 8rpx;
-	background-color: #1874CD;
-	border-radius: 50%;
-	margin: 6rpx auto 0;
-  }
+  }  
   
-  .notnormalspot {
-	width: 8rpx;
-	height: 8rpx;
-	background-color: #FFD700;
-	border-radius: 50%;
-	margin: 6rpx auto 0;
+  .notnormalspot {    
+	font-size: 10px;
+	display: flex; 
+	align-items: center;
+	justify-content: center;
+	margin-top: -5rpx;
   }

package-basic-data/pages/sign/sign.json

@@ -1,3 +1,4 @@
 {
-    "usingComponents": {}
+    "usingComponents": {},
+    "navigationBarTitleText": "签到"
 }

package-basic-data/pages/sign/sign.wxml

@@ -1,2 +1,5 @@
-<timeclock-calendar bind:change="dateChange" isopenshow="{{false}}" defaultTime="{{serverDate}}">
-</timeclock-calendar>
+<view> 
+	<dk-timeclock-calendar bind:change="dateChange">
+	</dk-timeclock-calendar>
+
+</view>

pages/home-page/home-page.js

@@ -79,7 +79,7 @@ Page({
           title: '分享不停歇',
           imageUrl: 'fin-icon.png',
           content: '云币数量涨不停',
-          dataUrl: '',
+          dataUrl: '/package-basic-data/pages/share/share',
           buttonTitle: '立即分享',
           buttonColor: '#ECD1A7',
           background: 'linear-gradient(223.67deg, #FFFFFF -15.06%, #FFF5E2 100%)'
@@ -88,7 +88,7 @@ Page({
           title: '签到有奖',
           imageUrl: 'ivt-icon.png',
           content: '云币不断，快快行动！',
-          dataUrl: '',
+          dataUrl: '/package-basic-data/pages/sign/sign',
           buttonTitle: '立即签到',
           buttonColor: '#CE9965',
           background: 'linear-gradient(225.36deg, #FFFFFF -10.7%, #F2D1AC 100%)'
@@ -301,11 +301,11 @@ Page({
   toAppStd(e) {
     let flg = e.currentTarget.dataset.flg
     let url = e.currentTarget.dataset.url
-    // 如果点击全部应用跳转到应用页面
-    if (flg) {
-      util.showToast('功能开发中，敬请期待')
-      return
-    }
+    // // 如果点击全部应用跳转到应用页面
+    // if (flg) {
+    //   util.showToast('功能开发中，敬请期待')
+    //   return
+    // }
 
     // 标准版 升级只能是 责任人才能升级
     if (!app.globalData.user.flgInit && url.indexOf('func-buy/add/add') > 0) {