wangxin 5 jaren geleden
bovenliggende
commit
9701791d5e
3 gewijzigde bestanden met toevoegingen van 12 en 12 verwijderingen
  1. 1 1
      pages/clock/clock-success/clock-success.js
  2. 3 3
      pages/clock/clock.js
  3. 8 8
      project.config.json

+ 1 - 1
pages/clock/clock-success/clock-success.js

@@ -31,7 +31,7 @@ Page({
         todayMoney: options.todayMoney,
       })
     }
-    const date = new Date()
+    const date = new Date(Number(options.time))
     this.setData({
       time: [date.getHours(), date.getMinutes()].map(val => val.toString()[1] ? val : '0' + val).join(':')
     })

+ 3 - 3
pages/clock/clock.js

@@ -140,7 +140,7 @@ Page({
     const data = await this.location()
     if (this.data.clockType === 1 && !this.data.wsPunchClockId) {
       this.clock(data.longitude, data.latitude)
-      // this.clock(120.353312, 31.535582)
+      // this.clock(120.35333936646411, 31.535590759589642)
     }
     if (this.data.clockType === 1 && this.data.wsPunchClockId) {
       wx.showModal({
@@ -176,7 +176,7 @@ Page({
           success: () => {
             clickStatus = true
             wx.navigateTo({
-              url: `./clock-success/clock-success?clockType=${this.data.clockType}&&sumMoney=${data.data.sumMoney}&&duration=${data.data.duration}&&todayMoney=${data.data.todayMoney}`
+              url: `./clock-success/clock-success?clockType=${this.data.clockType}&&sumMoney=${data.data.sumMoney}&&duration=${data.data.duration}&&todayMoney=${data.data.todayMoney}&&time=${this.data.wsPunchClockId ? data.data.endPunchClock : data.data.startPunchClock}`
             })
           }
         })
@@ -230,7 +230,7 @@ Page({
       const data = await this.location()
       wx.hideLoading()
       punchClockNeedInfo({ longitude: data.longitude, latitude: data.latitude }).then(data => {
-        // punchClockNeedInfo({ longitude: 120.353312, latitude: 31.535582 }).then(data => {
+      // punchClockNeedInfo({ longitude: 120.3533, latitude: 31.535590759589642 }).then(data => {
         locationStatus = true
         let {
           authenticationStatus,

+ 8 - 8
project.config.json

@@ -55,23 +55,23 @@
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
   "condition": {
-    "search": {
+    "plugin": {
       "current": -1,
       "list": []
     },
-    "conversation": {
-      "current": -1,
+    "game": {
+      "currentL": -1,
       "list": []
     },
-    "plugin": {
+    "gamePlugin": {
       "current": -1,
       "list": []
     },
-    "game": {
-      "currentL": -1,
+    "search": {
+      "current": -1,
       "list": []
     },
-    "gamePlugin": {
+    "conversation": {
       "current": -1,
       "list": []
     },
@@ -390,7 +390,7 @@
           "id": 44,
           "name": "打卡成功",
           "pathName": "pages/clock/clock-success/clock-success",
-          "query": "clockType=1",
+          "query": "clockType=1&&time=2020-09-24  09:44:32",
           "scene": null
         },
         {