Commit bfa8e316 authored by wangxuelai's avatar wangxuelai

'最新代码提价'

parent e896dbff
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>wechatapp.shangjiadao.com</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.aptana.ide.core.unifiedBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.aptana.projects.webnature</nature>
</natures>
<filteredResources>
<filter>
<id>1572251891427</id>
<name></name>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-node_modules</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
export default { export default {
imageRoot: 'https://cdn.img.shangjiadao.cn/qingxiao/daka/images/', imageRoot: 'https://cdn.img.shangjiadao.cn/qingxiao/daka/images/',
host: 'https://qxapi.qingxiao.online/daka', // host: 'https://qxapi.qingxiao.online/daka',
host2: 'https://wx.m.shangjiadao.cn', // host2: 'https://wx.m.shangjiadao.cn',
storageVersion: '4.0', storageVersion: '4.0',
imageVersion: '20191022', imageVersion: '20191022',
// host: 'https://clock.wp53.cn', host: 'https://clock.wp53.cn',
// host2: 'https://test.wp53.cn', host2: 'https://test.wp53.cn',
appId: 'wxc1246ea029394785', appId: 'wxc1246ea029394785',
miniProgram: { miniProgram: {
clock: 'wxdeee20e52a1fd7ee' clock: 'wxdeee20e52a1fd7ee'
......
...@@ -558,7 +558,6 @@ Page({ ...@@ -558,7 +558,6 @@ Page({
calendar_date: nowDay calendar_date: nowDay
}).then((res) => { }).then((res) => {
console.log(res);
const { const {
code, code,
data data
...@@ -1468,7 +1467,6 @@ Page({ ...@@ -1468,7 +1467,6 @@ Page({
if (today.getTime() > new Date(_activeDay.date).getTime()) { if (today.getTime() > new Date(_activeDay.date).getTime()) {
_activeDay.isAfter = true; _activeDay.isAfter = true;
} }
console.log(_activeDay,'activeDayactiveDay')
this.setData({ this.setData({
weeksArr: _weeksArr, weeksArr: _weeksArr,
activeDay: _activeDay activeDay: _activeDay
...@@ -1579,7 +1577,6 @@ Page({ ...@@ -1579,7 +1577,6 @@ Page({
// 处理日历打卡周期间的日期 // 处理日历打卡周期间的日期
getBetweenDateStr(start, end, restDates, clockDates) { getBetweenDateStr(start, end, restDates, clockDates) {
const _mycalendar = this.data.mycalendar; const _mycalendar = this.data.mycalendar;
console.log(_mycalendar, '_mycalendar')
const today = new Date(new Date().getFullYear() + '/' + (new Date().getMonth() + 1) + '/' + new Date().getDate()); const today = new Date(new Date().getFullYear() + '/' + (new Date().getMonth() + 1) + '/' + new Date().getDate());
if (start == end) { if (start == end) {
result.push({ result.push({
...@@ -1647,7 +1644,6 @@ Page({ ...@@ -1647,7 +1644,6 @@ Page({
const resultitem = result[i].year + '-' + result[i].month + '-' + result[i].day; const resultitem = result[i].year + '-' + result[i].month + '-' + result[i].day;
const resultitem1 = result[i].year + '-' + (result[i].month < 10 ? '0' + result[i].month : result[i].month) + '-' + (result[i].day < 10 ? '0' + result[i].day : result[i].day); const resultitem1 = result[i].year + '-' + (result[i].month < 10 ? '0' + result[i].month : result[i].month) + '-' + (result[i].day < 10 ? '0' + result[i].day : result[i].day);
for (let j = 0, l = restDates.length; j < l; j++) { for (let j = 0, l = restDates.length; j < l; j++) {
// console.log(resultitem,restDates[j])
if (resultitem == restDates[j]) { if (resultitem == restDates[j]) {
result[i].todoText.isrest = true result[i].todoText.isrest = true
break; break;
...@@ -1671,7 +1667,6 @@ Page({ ...@@ -1671,7 +1667,6 @@ Page({
} }
} }
} }
console.log(result,'resultresult')
setTimeout(()=>{ setTimeout(()=>{
setTodoLabels({ setTodoLabels({
days: result days: result
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment