diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue index 3fb6518..c2227c8 100644 --- a/components/base/tabbar.vue +++ b/components/base/tabbar.vue @@ -48,6 +48,13 @@ "title": "产品", key: 'product', }, + { + "selectedIconPath": "/static/image/tabbar/user-center-active.png", + "iconPath": "/static/image/tabbar/user-center.png", + "pagePath": "/pages/index/center", + "title": "我的", + key: 'center', + }, ] }; }, diff --git a/components/center/accountCard.vue b/components/center/accountCard.vue new file mode 100644 index 0000000..91a0278 --- /dev/null +++ b/components/center/accountCard.vue @@ -0,0 +1,54 @@ + + + + + \ No newline at end of file diff --git a/components/center/orderCard.vue b/components/center/orderCard.vue new file mode 100644 index 0000000..b217940 --- /dev/null +++ b/components/center/orderCard.vue @@ -0,0 +1,76 @@ + + + + + \ No newline at end of file diff --git a/components/center/reportCard.vue b/components/center/reportCard.vue new file mode 100644 index 0000000..2dfb7d9 --- /dev/null +++ b/components/center/reportCard.vue @@ -0,0 +1,180 @@ + + + + + \ No newline at end of file diff --git a/components/center/styles/card.scss b/components/center/styles/card.scss new file mode 100644 index 0000000..90dd6a5 --- /dev/null +++ b/components/center/styles/card.scss @@ -0,0 +1,15 @@ + + .card { + margin-top: 32rpx; + width: 100%; + background: #FAFAFF; + border: 2rpx solid #FFFFFF; + border-radius: 32rpx; + box-sizing: border-box; + } + + .cols { + .col { + flex: 1; + } + } \ No newline at end of file diff --git a/components/product/courseLiveCard.vue b/components/product/courseLiveCard.vue index e6492f0..11dba35 100644 --- a/components/product/courseLiveCard.vue +++ b/components/product/courseLiveCard.vue @@ -3,10 +3,18 @@ - - 距开始{{ countdown.day }}天 - {{ countdown.hour }}:{{ countdown.minute }}:{{ countdown.second }} - + + + 距开始{{ timeData.days }}天 + {{ timeData.hours>10?timeData.hours:'0'+timeData.hours}}:{{ timeData.minutes }}:{{ timeData.seconds }} + + @@ -29,8 +37,8 @@ }, data() { return { - timer: null, - countdown: null, + time: null, + timeData: {} } }, watch: { @@ -43,41 +51,21 @@ } }, methods: { + onChange(e) { + this.timeData = e + }, updateCountdown() { - this.timer && clearTimeout(this.timer) let current = dayjs() let startTime = dayjs(this.data.startTime) if (startTime.isSameOrBefore(current)) { - this.countdown = null + this.time = null return } - let countdown = { - day: 0, - hour: 0, - minute: 0, - second: 0, - } - - let day = Math.floor(startTime.diff(current, 'day', true)) - countdown.day = day - let hour = Math.floor(startTime.diff(current, 'hour', true)) - countdown.hour = hour - day * 24 - countdown.hour = countdown.hour < 10 ? `0${countdown.hour}` : countdown.hour - let minute = Math.floor(startTime.diff(current, 'minute', true)) - countdown.minute = minute - hour * 60 - countdown.minute = countdown.minute < 10 ? `0${countdown.minute}` : countdown.minute - let second = startTime.diff(current, 'second') - countdown.second = second - minute * 60 - countdown.second = countdown.second < 10 ? `0${countdown.second}` : countdown.second + this.time = startTime.diff(current, 'millisecond') - this.countdown = countdown - - this.timer = setTimeout(() => { - this.updateCountdown() - }, 1000) }, }, } diff --git a/pages/index/center copy.vue b/pages/index/center copy.vue new file mode 100644 index 0000000..0fd684f --- /dev/null +++ b/pages/index/center copy.vue @@ -0,0 +1,353 @@ + + + + + \ No newline at end of file diff --git a/pages/index/center.vue b/pages/index/center.vue index 0fd684f..4da99af 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -1,352 +1,209 @@ \ No newline at end of file diff --git a/pages_order/static/center/bg.png b/pages_order/static/center/bg.png new file mode 100644 index 0000000..49a62e3 Binary files /dev/null and b/pages_order/static/center/bg.png differ diff --git a/pages_order/static/center/icon-aboutUs.png b/pages_order/static/center/icon-aboutUs.png new file mode 100644 index 0000000..0989dab Binary files /dev/null and b/pages_order/static/center/icon-aboutUs.png differ diff --git a/pages_order/static/center/icon-comment.png b/pages_order/static/center/icon-comment.png new file mode 100644 index 0000000..5fe3153 Binary files /dev/null and b/pages_order/static/center/icon-comment.png differ diff --git a/pages_order/static/center/icon-detectBook.png b/pages_order/static/center/icon-detectBook.png new file mode 100644 index 0000000..3552adf Binary files /dev/null and b/pages_order/static/center/icon-detectBook.png differ diff --git a/pages_order/static/center/icon-instruc.png b/pages_order/static/center/icon-instruc.png new file mode 100644 index 0000000..3beaad3 Binary files /dev/null and b/pages_order/static/center/icon-instruc.png differ diff --git a/pages_order/static/center/icon-logout.png b/pages_order/static/center/icon-logout.png new file mode 100644 index 0000000..d02e2bc Binary files /dev/null and b/pages_order/static/center/icon-logout.png differ diff --git a/pages_order/static/center/icon-modifyInfo.png b/pages_order/static/center/icon-modifyInfo.png new file mode 100644 index 0000000..062d6d3 Binary files /dev/null and b/pages_order/static/center/icon-modifyInfo.png differ diff --git a/pages_order/static/center/icon-nav.png b/pages_order/static/center/icon-nav.png new file mode 100644 index 0000000..d36a2c6 Binary files /dev/null and b/pages_order/static/center/icon-nav.png differ diff --git a/pages_order/static/center/icon-service.png b/pages_order/static/center/icon-service.png new file mode 100644 index 0000000..8342c03 Binary files /dev/null and b/pages_order/static/center/icon-service.png differ diff --git a/pages_order/static/center/icon-userAgreement.png b/pages_order/static/center/icon-userAgreement.png new file mode 100644 index 0000000..71a79f3 Binary files /dev/null and b/pages_order/static/center/icon-userAgreement.png differ diff --git a/pages_order/static/center/icon-wx.png b/pages_order/static/center/icon-wx.png new file mode 100644 index 0000000..fb28062 Binary files /dev/null and b/pages_order/static/center/icon-wx.png differ diff --git a/pages_order/static/center/order-1.png b/pages_order/static/center/order-1.png new file mode 100644 index 0000000..0b64955 Binary files /dev/null and b/pages_order/static/center/order-1.png differ diff --git a/pages_order/static/center/order-2.png b/pages_order/static/center/order-2.png new file mode 100644 index 0000000..2ca27d0 Binary files /dev/null and b/pages_order/static/center/order-2.png differ diff --git a/pages_order/static/center/order-3.png b/pages_order/static/center/order-3.png new file mode 100644 index 0000000..7cd39a1 Binary files /dev/null and b/pages_order/static/center/order-3.png differ diff --git a/pages_order/static/center/order-4.png b/pages_order/static/center/order-4.png new file mode 100644 index 0000000..93466a5 Binary files /dev/null and b/pages_order/static/center/order-4.png differ diff --git a/pages_order/static/center/order-5.png b/pages_order/static/center/order-5.png new file mode 100644 index 0000000..ebd572d Binary files /dev/null and b/pages_order/static/center/order-5.png differ