上传图片

pages/clock/clock-tongji/index.js

@@ -116,6 +116,20 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
     const date = new Date()
     let year = date.getFullYear()
     let month = date.getMonth() + 1
@@ -135,20 +149,6 @@ Page({
   },
 
   /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {

pages/clock/clock-tongji/list.js

@@ -97,6 +97,20 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+   
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
     getCenterInfo().then(data => {
       let {
         approveStatus
@@ -118,20 +132,6 @@ Page({
   },
 
   /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {

pages/clock/clock-tongji/list.wxml

@@ -36,8 +36,8 @@
       <view class="value">{{clock.toFixed(mouthData.countDuration)}} 小时</view>
     </view>
     <view class="content">
-      <view class="label">打卡天数：</view>
-      <view class="value">{{mouthData.attendance || 0}} 天</view>
+      <view class="label">出勤次数：</view>
+      <view class="value">{{mouthData.attendance || 0}} 次</view>
     </view>
     <view class="content">
       <view class="label">缺卡：</view>
@@ -66,8 +66,8 @@
       <view class="value">{{clock.toFixed(weekData.countDuration)}} 小时</view>
     </view>
     <view class="content">
-      <view class="label">打卡天数：</view>
-      <view class="value">{{weekData.attendance || 0}} 天</view>
+      <view class="label">出勤次数：</view>
+      <view class="value">{{weekData.attendance || 0}} 次</view>
     </view>
     <view class="content">
       <view class="label">缺卡：</view>

pages/clock/clock.js

@@ -90,8 +90,8 @@ Page({
   async click() {
     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(data.longitude, data.latitude)
+      // this.clock(120.353312, 31.535582)
     }
     if (this.data.clockType === 1 && this.data.wsPunchClockId) {
       wx.showModal({
@@ -117,54 +117,6 @@ Page({
         showCancel: false,
       })
     }
-    // switch (this.data.status) {
-    //   case 0:
-    //     wx.showModal({
-    //       title: '提示',
-    //       content: '超出范围，请刷新页面获取当前位置',
-    //       showCancel: false,
-    //     })
-    //     break;
-    //   case 1:
-    //     this.setData({
-    //       statusImage: `${imgServerUrl}/images/clock/clock-out-disabled.png`,
-    //       statusIcon: `${imgServerUrl}/images/clock/clock-waring.png`,
-    //       statusMessage: `上班X小时候才能进行下班打卡`,
-    //       status: 2
-    //     })
-    //     setTimeout(() => {
-    //       this.setData({
-    //         statusImage: `${imgServerUrl}/images/clock/clock-out.png`,
-    //         statusIcon: `${imgServerUrl}/images/clock/clock-can.png`,
-    //         statusMessage: `已进入考勤打卡范围`,
-    //         status: 3
-    //       })
-    //     }, 2000)
-    //     wx.navigateTo({
-    //       url: './clock-success/clock-success?status=3'
-    //     })
-    //     break;
-    //   case 2:
-    //     wx.showModal({
-    //       title: '提示',
-    //       content: '未到下班时间，请刷新页面获取最新状态',
-    //       showCancel: false,
-    //     })
-    //     break;
-    //   case 3:
-    //     this.setData({
-    //       statusImage: `${imgServerUrl}/images/clock/clock-done.png`,
-    //       statusMessage: `今日打卡已完成`,
-    //       status: 4
-    //     })
-    //     wx.navigateTo({
-    //       url: './clock-success/clock-success?status=4'
-    //     })
-    //     break;
-    //   default:
-    //     break;
-    // }
-
   },
   clock(longitude, latitude) {
     savePunchClock({ longitude, latitude, clockType: this.data.clockType }).then(data => {
@@ -204,9 +156,8 @@ Page({
   },
   async load() {
     const data = await this.location()
-    console.log(data)
-    // punchClockNeedInfo({ longitude: data.longitude, latitude: data.latitude }).then(data => {
-    punchClockNeedInfo({ longitude: 120.353312, latitude: 31.535582 }).then(data => {
+    punchClockNeedInfo({ longitude: data.longitude, latitude: data.latitude }).then(data => {
+    // punchClockNeedInfo({ longitude: 120.353312, latitude: 31.535582 }).then(data => {
       let {
         authenticationStatus,
         startPunch,

pages/clock/clock.wxml

@@ -24,10 +24,10 @@
   </view>
   <view class="no-pass" wx:elif="{{approveStatus === 2}}">
     <view class="header">
-      <image src="../../images/clock/clock-bg.png" class="no-pass-bg" mode="widthFixed"></image>
+      <image src="{{imgServerUrl}}/images/clock/clock-bg.png" class="no-pass-bg" mode="widthFixed"></image>
     </view>
     <view class="no-pass-content">
-      <image src="../../images/clock/clock-no-certified.png" class="no-passs-img"></image>
+      <image src="{{imgServerUrl}}/images/clock/clock-no-certified.png" class="no-passs-img"></image>
       <view class="no-pass-content-text">
         <view>您还没有实名认证</view>
         <view>为保证账户安全，请完成实名认证后再进行打卡签到。</view>
@@ -36,7 +36,7 @@
         前往认证
       </navigator>
     </view>
-    <image src="../../images/clock/clock-video.png" class="video"></image>
+    <image src="{{imgServerUrl}}/images/clock/clock-video.png" class="video"></image>
   </view>
   <view class="pass" wx:else>
     <view class="pass-header">
@@ -101,7 +101,7 @@
         <text>{{statusMessage}}</text>
       </view>
       <view class="reload-location" bindtap="load" wx:if="{{clockType === 3}}">
-        <image src="../../images/clock/re fresh.png"></image>
+        <image src="../../images/clock/refresh.png"></image>
         <text>重新定位</text>
       </view>
       <view class="prepayable">

pages/result/index.wxml

@@ -30,7 +30,7 @@
   </view>
 
   <view class="submit-content" wx:if="{{type=='auth'&& status==2}}">
-    <image src="../../images/happyjob/identification-shcg.png"></image>
+    <image src="{{imgServerUrl}}/happyjob/identification-shcg.png"></image>
     <view class="identification-submit">实名认证提交成功</view>
     <view class="identification-message">我们会尽快审核，请您耐心等待</view>
     <view class="identification-btn">