diff --git a/CHANGELOG.md b/CHANGELOG.md index d01e1a0..265cc4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ - | 添加时间轴上下滚动 | 2b81bbc - | 添加项目排序 | a0b491b - | 点击日历日期查询项目列表 | c458385 + - | 细节调整,添加project-webview | 4d9050b - | 绑定手机号 | 52e0352 - | 缓存修改 | 63e1f0d - | 角色栏实现 | 94cd671 diff --git a/src/components/Calendar/Calendar.vue b/src/components/Calendar/Calendar.vue deleted file mode 100644 index 57afd47..0000000 --- a/src/components/Calendar/Calendar.vue +++ /dev/null @@ -1,473 +0,0 @@ - - - - - diff --git a/src/components/Calendar/generateDates.js b/src/components/Calendar/generateDates.js deleted file mode 100644 index c08fc6a..0000000 --- a/src/components/Calendar/generateDates.js +++ /dev/null @@ -1,136 +0,0 @@ -/* - *此函数的作用是根据传入的一个日期,返回这一周的日期或者这一个月的日期, - * 如果是月的话注意还包含上个月和下个月的日期,月的话总共数据有 6 * 7 = 42个 - * - */ -/* - * 时间格式化函数 - * 重要提示,微信小程序new Date('2020-04-16')在ios中无法获取时间对象 - * 解决方式: 建议将时间都格式化成'2020/04/16 00:00:00'的格式 - * 函数示例: formatDate(new Date(), 'YYYY/MM/dd hh:mm:ss') - */ -export const formatDate = (date, fmt) => { - if (/(y+)/.test(fmt)) { - fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length)); - } - let o = { - 'M+': date.getMonth() + 1, - 'd+': date.getDate(), - 'h+': date.getHours(), - 'm+': date.getMinutes(), - 's+': date.getSeconds(), - }; - for (let k in o) { - if (new RegExp(`(${k})`).test(fmt)) { - let str = o[k] + ''; - fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : padLeftZero(str)); - } - } - return fmt; -}; -const padLeftZero = str => { - return ('00' + str).substr(str.length); -}; - -// 判断是不是date对象 -export const judgeType = s => { - // 函数返回数据的具体类型 - return Object.prototype.toString.call(s).slice(8, -1); -}; - -export const equalDate = (d1, d2) => { - let result = false; - if (d1.getFullYear() === d2.getFullYear() && d1.getMonth() === d2.getMonth() && d1.getDate() === d2.getDate()) { - result = true; - } - return result; -}; - -/* 比较时间,时间格式为2020-04-04 - */ -export const dateEqual = (before, after) => { - before = new Date(before.replace('-', '/').replace('-', '/')); - after = new Date(after.replace('-', '/').replace('-', '/')); - if (before.getTime() - after.getTime() === 0) { - return true; - } else { - return false; - } -}; - -export const gegerateDates = (date = new Date(), type = 'week') => { - const result = []; - if (judgeType(date) === 'Date') { - // 年,月,日 - const y = date.getFullYear(); - const m = date.getMonth(); - const d = date.getDate(); - const days = new Date(y, m + 1, 0).getDate(); - // 获取日期是星期几 - // let weekIndex = date.getDay() === 0 ? 7 : date.getDay(); - let weekIndex = date.getDay(); - if (type === 'month') { - const dobj = new Date(y, m, 1); - // weekIndex = dobj.getDay() === 0 ? 7 : dobj.getDay(); - weekIndex = dobj.getDay(); - } - if (type === 'week') { - for (let i = weekIndex; i > 0; i--) { - const dtemp = new Date(y, m, d); - dtemp.setDate(dtemp.getDate() - i); - result.push({ - time: dtemp, - show: true, - fullDate: formatDate(dtemp, 'yyyy-MM-dd'), - isToday: equalDate(new Date(), dtemp), - }); - } - for (let i = 0; i <= 7 - weekIndex; i++) { - const dtemp = new Date(y, m, d); - dtemp.setDate(dtemp.getDate() + i); - result.push({ - time: dtemp, - show: true, - fullDate: formatDate(dtemp, 'yyyy-MM-dd'), - isToday: equalDate(new Date(), dtemp), - }); - } - } else if (type === 'month') { - // 上个月 - for (let i = weekIndex; i > 0; i--) { - const dtemp = new Date(y, m, 1); - dtemp.setDate(dtemp.getDate() - i); - result.push({ - time: dtemp, - show: false, - fullDate: formatDate(dtemp, 'yyyy-MM-dd'), - isToday: equalDate(new Date(), dtemp), - }); - } - // 这个月的日期 - for (let i = 0; i < days; i++) { - const dtemp = new Date(y, m, 1); - dtemp.setDate(dtemp.getDate() + i); - result.push({ - time: dtemp, - show: true, - fullDate: formatDate(dtemp, 'yyyy-MM-dd'), - isToday: equalDate(new Date(), dtemp), - }); - } - const len = 42 - result.length; - // 下个月的日期 - for (let i = 1; i <= len; i++) { - const dtemp = new Date(y, m + 1, 0); - dtemp.setDate(dtemp.getDate() + i); - result.push({ - time: dtemp, - show: false, - fullDate: formatDate(dtemp, 'yyyy-MM-dd'), - isToday: equalDate(new Date(), dtemp), - }); - } - } - } - return result; -}; diff --git a/src/components/ImageCode/ImageCode.vue b/src/components/ImageCode/ImageCode.vue deleted file mode 100644 index c8a67b8..0000000 --- a/src/components/ImageCode/ImageCode.vue +++ /dev/null @@ -1,37 +0,0 @@ - - - - - diff --git a/src/components/Projects/ProjectItem.vue b/src/components/Projects/ProjectItem.vue deleted file mode 100644 index 84ff924..0000000 --- a/src/components/Projects/ProjectItem.vue +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/src/components/Projects/Projects.vue b/src/components/Projects/Projects.vue deleted file mode 100644 index 326ef55..0000000 --- a/src/components/Projects/Projects.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - diff --git a/src/pages.json b/src/pages.json index cb0c667..9647dde 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,29 +1,11 @@ { "pages": [ - { - "path": "pages/index/index", - "style": { - "navigationBarText": "TALL" - } - }, { "path": "pages/project/project", "style": { "navigationStyle": "custom", "navigationBarTextStyle": "white" } - }, - { - "path": "pages/phone-bind/phone-bind", - "style": { - "navigationBarTitleText": "绑定手机号" - } - }, - { - "path": "pages/project-webview/project-webview", - "style": { - "navigationBarTitleText": "project-webview" - } } ], "globalStyle": { diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue deleted file mode 100644 index d27bd50..0000000 --- a/src/pages/index/index.vue +++ /dev/null @@ -1,130 +0,0 @@ - - - - - diff --git a/src/pages/phone-bind/phone-bind.vue b/src/pages/phone-bind/phone-bind.vue deleted file mode 100644 index 000532b..0000000 --- a/src/pages/phone-bind/phone-bind.vue +++ /dev/null @@ -1,189 +0,0 @@ - - - - - diff --git a/src/pages/project-webview/project-webview.vue b/src/pages/project-webview/project-webview.vue deleted file mode 100644 index 08af3bd..0000000 --- a/src/pages/project-webview/project-webview.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/src/pages/test/test.vue b/src/pages/test/test.vue deleted file mode 100644 index 5ec1fc1..0000000 --- a/src/pages/test/test.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - diff --git a/src/static/local_play1.png b/src/static/local_play1.png deleted file mode 100644 index bb6ac2c..0000000 Binary files a/src/static/local_play1.png and /dev/null differ diff --git a/src/static/logo.png b/src/static/logo.png deleted file mode 100644 index b5771e2..0000000 Binary files a/src/static/logo.png and /dev/null differ