wangxin 5 år sedan
förälder
incheckning
54a5de4882
5 ändrade filer med 17 tillägg och 17 borttagningar
  1. 1 1
      app.js
  2. 10 10
      config/config.js
  3. 2 2
      pages/clock/clock-tongji/index.wxml
  4. 3 3
      pages/clock/clock-tongji/list.wxml
  5. 1 1
      project.config.json

+ 1 - 1
app.js

@@ -130,7 +130,7 @@ App({
     memberId: "",
     sessionKey: '',
     city: updataStorageData('city') || '无锡',
-    version: '1.3.9'
+    version: '1.4.0'
   },
   //页面分享
   onShareAppMessage: function () {

+ 10 - 10
config/config.js

@@ -1,15 +1,15 @@
 // 测试服
-const apiUrl = "https://kf.hap-job.com/happyjob"
-const rootUrl = "https://kf.hap-job.com"
-const imgServerUrl = "https://hpjobtest.oss-cn-shanghai.aliyuncs.com/uploadfiles/mina"//静态资源图片服务器地址
-const imgServerUrl_new = "https://hpjobtest.oss-cn-shanghai.aliyuncs.com"//图片服务器地址
-const captcha = '2078399419'
+// const apiUrl = "https://kf.hap-job.com/happyjob"
+// const rootUrl = "https://kf.hap-job.com"
+// const imgServerUrl = "https://hpjobtest.oss-cn-shanghai.aliyuncs.com/uploadfiles/mina"//静态资源图片服务器地址
+// const imgServerUrl_new = "https://hpjobtest.oss-cn-shanghai.aliyuncs.com"//图片服务器地址
+// const captcha = '2078399419'
 // 正式服
-// const apiUrl = "https://web.hap-job.com/happyjob"
-// const rootUrl = "https://web.hap-job.com"
-// const imgServerUrl = "https://happyjob.oss-cn-shanghai.aliyuncs.com/uploadfiles/mina" //图片服务器地址
-// const imgServerUrl_new = "https://happyjob.oss-cn-shanghai.aliyuncs.com" //图片服务器地址
-// const captcha = '2019232819'
+const apiUrl = "https://web.hap-job.com/happyjob"
+const rootUrl = "https://web.hap-job.com"
+const imgServerUrl = "https://happyjob.oss-cn-shanghai.aliyuncs.com/uploadfiles/mina" //图片服务器地址
+const imgServerUrl_new = "https://happyjob.oss-cn-shanghai.aliyuncs.com" //图片服务器地址
+const captcha = '2019232819'
 
 module.exports = {
   apiUrl,

+ 2 - 2
pages/clock/clock-tongji/index.wxml

@@ -12,11 +12,11 @@
         <view class="name">总预支(元)</view>
       </view>
       <view class="header-content-items">
-        <view class="number">{{currentSettlement.countDuration}}</view>
+        <view class="number">{{currentSettlement.countDuration || 0}}</view>
         <view class="name">总工时(小时)</view>
       </view>
       <view class="header-content-items">
-        <view class="number">{{currentSettlement.lackClock}}</view>
+        <view class="number">{{currentSettlement.lackClock || 0}}</view>
         <view class="name">缺卡(次)</view>
       </view>
     </view>

+ 3 - 3
pages/clock/clock-tongji/list.wxml

@@ -21,7 +21,7 @@
         <view class="last" bindtap="mouthLast">
           <image src="{{mouthLast}}"></image>
         </view>
-        <text class="calendar-content-choose-text">{{year}}-{{mouth>10?mouth:'0'+mouth}}</text>
+        <text class="calendar-content-choose-text">{{year}}-{{mouth>=10?mouth:'0'+mouth}}</text>
         <view class="next" bindtap="mouthNext">
           <image src="{{mouthNext}}"></image>
         </view>
@@ -33,7 +33,7 @@
     </view>
     <view class="content">
       <view class="label">总工时:</view>
-      <view class="value">{{mouthData.countDuration}} 小时</view>
+      <view class="value">{{mouthData.countDuration || 0}} 小时</view>
     </view>
     <view class="content">
       <view class="label">出勤次数:</view>
@@ -63,7 +63,7 @@
     </view>
     <view class="content">
       <view class="label">总工时:</view>
-      <view class="value">{{weekData.countDuration}} 小时</view>
+      <view class="value">{{weekData.countDuration || 0}} 小时</view>
     </view>
     <view class="content">
       <view class="label">出勤次数:</view>

+ 1 - 1
project.config.json

@@ -46,7 +46,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.8.3",
-  "appid": "wx5ae6908ae55edcb7",
+  "appid": "wx1e8ed93850777ffb",
   "projectname": "kaixin",
   "debugOptions": {
     "hidedInDevtools": []