diff --git a/src/components/time.vue b/src/components/time.vue index 0b2cebc..cbfce81 100644 --- a/src/components/time.vue +++ b/src/components/time.vue @@ -38,49 +38,49 @@ export default { this.hours = `${hh}` this.minutes = `${mm}` this.seconds = `${ss}` - this.date = `${year}年${month}月${date}日` - if (this.$i18n.locale === 'en-us') { - let enMonth = '' - switch (month) { - case 1: - enMonth = 'Jan.' - break - case 2: - enMonth = 'Feb.' - break - case 3: - enMonth = 'Mar.' - break - case 4: - enMonth = 'Apr.' - break - case 5: - enMonth = 'May' - break - case 6: - enMonth = 'Jun.' - break - case 7: - enMonth = 'Jul.' - break - case 8: - enMonth = 'Aug.' - break - case 9: - enMonth = 'Sep.' - break - case 10: - enMonth = 'Oct.' - break - case 11: - enMonth = 'Nov.' - break - case 12: - enMonth = 'Dec.' - break - } - this.date = `${date}th ${enMonth}, ${year}` - } + this.date = `${year} - ${month} - ${date}` + // if (this.$i18n.locale === 'en-us') { + // let enMonth = '' + // switch (month) { + // case 1: + // enMonth = 'Jan.' + // break + // case 2: + // enMonth = 'Feb.' + // break + // case 3: + // enMonth = 'Mar.' + // break + // case 4: + // enMonth = 'Apr.' + // break + // case 5: + // enMonth = 'May' + // break + // case 6: + // enMonth = 'Jun.' + // break + // case 7: + // enMonth = 'Jul.' + // break + // case 8: + // enMonth = 'Aug.' + // break + // case 9: + // enMonth = 'Sep.' + // break + // case 10: + // enMonth = 'Oct.' + // break + // case 11: + // enMonth = 'Nov.' + // break + // case 12: + // enMonth = 'Dec.' + // break + // } + // this.date = `${date}th ${enMonth}, ${year}` + // } this.week = `${week}` } }, @@ -99,11 +99,12 @@ export default { flex-direction column height 77px .date-wraper - width 130px - _font(34px, 36px, #B4C1D8,,right) + width 111px + _font(25px, 19px, #B4C1D8,,right) font-family SourceHanSansCN-Regular .time-wraper - width 130px - _font(16px, 30px, #B4C1D8,,right) + width 111px + _font(16px, 13px, #B4C1D8,,right) + margin-top 10px font-family SourceHanSansCN-Regular diff --git a/src/images/new/header_bg.png b/src/images/new/header_bg.png index 51f343a..948b266 100644 Binary files a/src/images/new/header_bg.png and b/src/images/new/header_bg.png differ diff --git a/src/images/new/login_bg.png b/src/images/new/login_bg.png old mode 100755 new mode 100644 index 7e75b3c..272fb18 Binary files a/src/images/new/login_bg.png and b/src/images/new/login_bg.png differ diff --git a/src/images/new/logo.png b/src/images/new/logo.png old mode 100755 new mode 100644 index c911353..7e04818 Binary files a/src/images/new/logo.png and b/src/images/new/logo.png differ diff --git a/src/pages/shells/index/index.vue b/src/pages/shells/index/index.vue index a4c26c6..a3251ec 100644 --- a/src/pages/shells/index/index.vue +++ b/src/pages/shells/index/index.vue @@ -38,7 +38,7 @@
- +