SxhGroup / sxhClockIn

Download as
Browse Code »

Commit 6be5e8a2a94c5d8eebe78fae2d371f09b21ec973

Authored by 边
1 parent 16297019
Exists in master

1.4版本

Showing 6 changed files with 31 additions and 16 deletions   Show diff stats
pages/index/achievement/achievement.wxml
  Diff comments   View file @6be5e8a
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <view class="grey_line"></view> 20 <view class="grey_line"></view>
21 <view class="box" wx:if="{{recordVoShow}}"> 21 <view class="box" wx:if="{{recordVoShow}}">
22 <view class="box_title">打卡成果</view> 22 <view class="box_title">打卡成果</view>
23 - <view class="box_blue" wx:if="{{recordVo.hasData==1}}">本次打卡坚持了<span>{{recordVo.taskStatisticsParam}}{{taskVo.statisticsUnit}}</span></view> 23 + <view class="box_blue" wx:if="{{taskVo.hasData==1}}">本次打卡坚持了<span>{{recordVo.taskStatisticsParam}}{{taskVo.statisticsUnit}}</span></view>
24 <view class="box_grey">"{{recordVo.taskRecordDesc}}"</view> 24 <view class="box_grey">"{{recordVo.taskRecordDesc}}"</view>
25 <view class="box_pic"> 25 <view class="box_pic">
26 <view class="box_img" wx:for="{{recordVo.files}}" wx:key="index" wx:for-item="value"> 26 <view class="box_img" wx:for="{{recordVo.files}}" wx:key="index" wx:for-item="value">
pages/index/newPunch/newPunch.js
  Diff comments   View file @6be5e8a
@@ -64,19 +64,20 @@ Page({ @@ -64,19 +64,20 @@ Page({
64 }, 64 },
65 // 第二列 65 // 第二列
66 { 66 {
67 - values: ['8:00', '9:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00'], 67 + values: ['5:00','6:00','7:00','8:00', '9:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00', '24:00'],
68 defaultIndex: 1, 68 defaultIndex: 1,
69 }, 69 },
70 ], 70 ],
71 //打卡缺卡提醒 71 //打卡缺卡提醒
72 clockLackShow: false, 72 clockLackShow: false,
73 - columnsClockLack: [1,2,3], 73 + columnsClockLack: [1,2,3,4,5,6,7,8,9,10],
74 //必须包含 74 //必须包含
75 containShow: false, 75 containShow: false,
76 columnsContain: ['无限制','图片'], 76 columnsContain: ['无限制','图片'],
77 }, 77 },
78 //获取模板详情 / 空模板 78 //获取模板详情 / 空模板
79 getDetail() { 79 getDetail() {
  80 + if(this.data.tempId == 0) return
80 request({ 81 request({
81 url: `/wx/temp/getTempDetail`, 82 url: `/wx/temp/getTempDetail`,
82 method: 'get', 83 method: 'get',
pages/index/newPunch/newPunch.wxml
  Diff comments   View file @6be5e8a
@@ -2,12 +2,12 @@ @@ -2,12 +2,12 @@
2 <view class="punch_detail"> 2 <view class="punch_detail">
3 <view class="title_card"> 3 <view class="title_card">
4 <van-cell-group border="{{ false }}"> 4 <van-cell-group border="{{ false }}">
5 - <van-field value="{{ form.taskTitle }}" placeholder="请输入标题" border="{{ false }}" bind:change="onfieldChange" /> 5 + <van-field value="{{ form.taskTitle }}" placeholder="请输入标题" border="{{ false }}" bind:change="onfieldChange" />
6 </van-cell-group> 6 </van-cell-group>
7 <view class="grey_line"></view> 7 <view class="grey_line"></view>
8 <view class="box_card"> 8 <view class="box_card">
9 <van-cell-group border="{{ false }}"> 9 <van-cell-group border="{{ false }}">
10 - <van-field value="{{ form.taskDesc }}" type="textarea" placeholder="请输入" autosize border="{{ false }}" bind:change="onfieldDescChange" /> 10 + <van-field value="{{ form.taskDesc }}" type="textarea" placeholder="请输入" border="{{ false }}" bind:change="onfieldDescChange" />
11 </van-cell-group> 11 </van-cell-group>
12 </view> 12 </view>
13 <view class="tip_card"> 13 <view class="tip_card">
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 学生如缺卡达到一定条件，将会提醒家长 77 学生如缺卡达到一定条件，将会提醒家长
78 </view> 78 </view>
79 <view class="white_card_nopadding"> 79 <view class="white_card_nopadding">
80 - <van-cell-group border="{{ false }}" > 80 + <van-cell-group border="{{ false }}">
81 <van-cell title="提交时必须包含" value="{{ form.submitCondition }}" is-link border="{{ false }}" bindtap="openContainShow" /> 81 <van-cell title="提交时必须包含" value="{{ form.submitCondition }}" is-link border="{{ false }}" bindtap="openContainShow" />
82 </van-cell-group> 82 </van-cell-group>
83 </view> 83 </view>
pages/index/newPunch/newPunch.wxss
  Diff comments   View file @6be5e8a
@@ -79,4 +79,5 @@ @@ -79,4 +79,5 @@
79 background-color: #fff; 79 background-color: #fff;
80 padding: 20px 30px 80px; 80 padding: 20px 30px 80px;
81 box-sizing: border-box; 81 box-sizing: border-box;
82 -}  
83 \ No newline at end of file 82 \ No newline at end of file
  83 +}
  84 +
pages/index/punchDetail/punchDetail.js
  Diff comments   View file @6be5e8a
@@ -23,7 +23,7 @@ Page({ @@ -23,7 +23,7 @@ Page({
23 hideHeader: true, // 隐藏日历头部操作栏 23 hideHeader: true, // 隐藏日历头部操作栏
24 disableMode: { // 禁用某一天之前/之后的所有日期 24 disableMode: { // 禁用某一天之前/之后的所有日期
25 type: 'after', // [‘before’, 'after'] 25 type: 'after', // [‘before’, 'after']
26 - // 无该属性或该属性值为假，则默认为当天 26 + // 无该属性或该属性值为假，则默认为当天
27 }, 27 },
28 }, 28 },
29 isDisplay: false, 29 isDisplay: false,
@@ -231,14 +231,27 @@ Page({ @@ -231,14 +231,27 @@ Page({
231 title: '打卡成功', 231 title: '打卡成功',
232 icon: 'none' 232 icon: 'none'
233 }) 233 })
234 - let e = {  
235 - detail: {  
236 - date: moment(this.data.form.repairDate).format('DD'),  
237 - month: moment(this.data.form.repairDate).format('MM'),  
238 - year: moment(this.data.form.repairDate).format('YYYY') 234 + let e
  235 + if (this.data.form.isRepair == 2) {
  236 + e = {
  237 + detail: {
  238 + date: moment(this.data.form.repairDate).format('DD'),
  239 + month: moment(this.data.form.repairDate).format('MM'),
  240 + year: moment(this.data.form.repairDate).format('YYYY')
  241 + }
239 } 242 }
  243 + this.getInfo(moment(this.data.form.repairDate).format('YYYY-MM-DD'), 1, e)
  244 + } else {
  245 + e = {
  246 + detail: {
  247 + date: moment().date(),
  248 + month: moment().month() + 1,
  249 + year: moment().year()
  250 + }
  251 + }
  252 + this.getInfo(moment(new Date().getTime()).format('YYYY-MM-DD'), 0, e)
240 } 253 }
241 - this.getInfo(moment(this.data.form.repairDate).format('YYYY-MM-DD'), 1, e) 254 +
242 this.closeClockShow() 255 this.closeClockShow()
243 } else { 256 } else {
244 wx.showToast({ 257 wx.showToast({
pages/index/punchDetail/punchDetail.wxml
  Diff comments   View file @6be5e8a
@@ -17,9 +17,9 @@ @@ -17,9 +17,9 @@
17 </view> 17 </view>
18 </view> 18 </view>
19 <view class="btn_box"> 19 <view class="btn_box">
20 - <van-button round color="#F4F4F4" bindtap='toAchieve' custom-style="color: #000;">我 的 成 果</van-button> 20 + <van-button round color="#F4F4F4" bindtap='toAchieve' custom-style="color: #000;">我 的 成 果</van-button>
21 <van-button round type="info" bindtap='toClock' wx:if="{{isToday}}">立 即 打 卡</van-button> 21 <van-button round type="info" bindtap='toClock' wx:if="{{isToday}}">立 即 打 卡</van-button>
22 - <van-button round type="warning" bindtap='toRepairClock' wx:if="{{taskVo.allowRepairCard == 1&&repairText=='缺卡'&&!isToday&&!isLarge}}">补 卡</van-button> 22 + <van-button round type="warning" bindtap='toRepairClock' wx:if="{{taskVo.allowRepairCard == 1&&repairText=='缺卡'&&!isToday&&!isLarge}}">补 卡</van-button>
23 </view> 23 </view>
24 24
25 <!--打卡--> 25 <!--打卡-->