姜永辉 1 jaar geleden
bovenliggende
commit
ffd7212a10

+ 3 - 3
api/pages/sharesign/sign.js

@@ -8,12 +8,12 @@
  *		姜永辉	  	     2024-7-24       			1.00		       	新建
  *******************************************************************************/
 module.exports = {
-	signService: {
+	signRecordService: {
 		// 前缀
-		prefix: 'oauth-server/sign/',
+		prefix: 'oauth-server/oauth/signRecord/',
 	},
 	routeUrl: {
-		sign: {
+		signRecord: {
 
 		}
 	}

+ 5 - 2
components/dkbase/dk-timeclock-calendar/dk-timeclock-calendar.js

@@ -178,9 +178,12 @@ Component({
       this.data.dateList.forEach(item => {
         let index = timeArr.indexOf(item.dateString)
         let diff = new Date(item.dateString).dayDiff(new Date(this.data.defaultTime))
-        console.log(diff,item,this.data.defaultTime);
+        let month = new Date(item.dateString).getMonth()
+        let monthDefault = new Date(this.data.defaultTime).getMonth()
+
+        console.log(diff,month,monthDefault);
         // 判断未来日期 不能显示标题
-        if (diff <= 0) {
+        if (diff <= 0 && month==monthDefault) {
           // 正常 显示文字
           item.isnormal = true
           item.title = index !== -1?this.data.spot[index].title:null

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

@@ -32,7 +32,7 @@
 				{{item.day}}
 			</view>
 			<!--isnormal 0 正常 1 异常  -->
-			<view class="notnormalspot" wx:if="{{item.isnormal}}" style="{{'color:' + (item.title!=null?'#EBC07F':'#ac0909')}}">
+			<view class="notnormalspot" wx:if="{{item.isnormal}}" style="{{'color:' + (item.title!=null?'#FF7B1A':'#ac0909')}}">
 				{{item.title!=null?item.title:'漏签'}}
 			</view>
 		</view>

+ 13 - 1
package-basic-data/pages/sign/sign.js

@@ -22,7 +22,7 @@ Page({
         companyName: null,
         versionName: '',
         // 路由
-        routeObjName: 'sign',
+        routeObjName: 'signRecord',
         // 策略
         integralTacticItem: {},
         // 积分
@@ -63,6 +63,18 @@ Page({
     },
 
     /**
+   * 日期
+   * @param {*} e 
+   */
+  dateChange(e) {
+    // {year: 2021, month: 7, day: 25, dateString: "2021-07-25"} 
+    console.log("dateChange", e.detail.dateString)
+    this.setData({
+      deliangdate: e.detail.dateString
+    }) 
+  },
+
+    /**
     * @desc : 服务器的日期
     * @author : 姜永辉
     * @date : 2024/4/1