1.4版本

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