From 00a7ea4bda94fa861857e410b881ac6c619007f0 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Mon, 11 Oct 2021 19:52:08 +0800 Subject: [PATCH] no message --- app.json | 2 +- pages/home/index/index.js | 2 +- .../{message/index => html/message}/index.js | 0 .../index => html/message}/index.json | 0 .../index => html/message}/index.wxml | 35 ++++++++++++++++--- .../index => html/message}/index.wxss | 0 pages/mall/fragment/index.js | 2 +- pages/message/index.wxs | 28 --------------- utils/util.js | 4 +-- 9 files changed, 35 insertions(+), 38 deletions(-) rename pages/{message/index => html/message}/index.js (100%) rename pages/{message/index => html/message}/index.json (100%) rename pages/{message/index => html/message}/index.wxml (68%) rename pages/{message/index => html/message}/index.wxss (100%) delete mode 100644 pages/message/index.wxs diff --git a/app.json b/app.json index ab91f62..fa62ffa 100644 --- a/app.json +++ b/app.json @@ -53,7 +53,7 @@ "pages/purchase/index/index", "pages/purchase/create/index", "pages/purchase/detail/index", - "pages/message/index/index", + "pages/html/message/index", "pages/html/banner/index", "pages/html/html/index", "pages/html/notice/index", diff --git a/pages/home/index/index.js b/pages/home/index/index.js index 485f041..a86c8cc 100644 --- a/pages/home/index/index.js +++ b/pages/home/index/index.js @@ -100,7 +100,7 @@ Component({ } else if (e.currentTarget.id == 'agent') { util.navigateTo('/pages/agent/order/index') } else if (e.currentTarget.id == 'message') { - util.navigateTo('/pages/message/index/index') + util.navigateTo('/pages/html/message/index') } else if (e.currentTarget.id == 'balance') { util.navigateTo('/pages/withdrawal/balance/index') } else if (e.currentTarget.id == 'integral') { diff --git a/pages/message/index/index.js b/pages/html/message/index.js similarity index 100% rename from pages/message/index/index.js rename to pages/html/message/index.js diff --git a/pages/message/index/index.json b/pages/html/message/index.json similarity index 100% rename from pages/message/index/index.json rename to pages/html/message/index.json diff --git a/pages/message/index/index.wxml b/pages/html/message/index.wxml similarity index 68% rename from pages/message/index/index.wxml rename to pages/html/message/index.wxml index e4ac086..9834f7b 100644 --- a/pages/message/index/index.wxml +++ b/pages/html/message/index.wxml @@ -1,5 +1,3 @@ - - 消息 @@ -34,14 +32,13 @@ [{{item.categoryName}}] - {{message.formateDate(item.createTime)}} + {{formateDate(item.createTime)}} {{item.content}} - @@ -51,4 +48,32 @@ - \ No newline at end of file + + + + function isEmpty(val) { + return typeof val === 'undefined' || val === '' || val === null + } + + function formateDate(datetime) { + if (isEmpty(datetime)) { + return '' + } + var dayCode = 24 * 60 * 60 * 1000 + datetime = datetime.replace(getRegExp('/\s/g', 'g'), '') + var date = getDate(datetime.trim()) + var today = getDate() + var yestoday = getDate(getDate().getTime() - dayCode) + var week = '' + if (date.getFullYear() === today.getFullYear() && date.getMonth() === today.getMonth() && date.getDate() === today.getDate()) { + week = '今天 ' + datetime.substring(10) + } else if (date.getFullYear() === yestoday.getFullYear() && date.getMonth() === yestoday.getMonth() && date.getDate() === yestoday.getDate()) { + week = '昨天 ' + datetime.substring(10) + } + if (isEmpty(week)) { + return datetime + } + return week + } + module.exports = formateDate + \ No newline at end of file diff --git a/pages/message/index/index.wxss b/pages/html/message/index.wxss similarity index 100% rename from pages/message/index/index.wxss rename to pages/html/message/index.wxss diff --git a/pages/mall/fragment/index.js b/pages/mall/fragment/index.js index ce8f9e6..9f30f1f 100644 --- a/pages/mall/fragment/index.js +++ b/pages/mall/fragment/index.js @@ -122,7 +122,7 @@ Component({ } else if(e.currentTarget.id == 'city'){ wx.navigateTo({url: `/pages/home/city-select/index?type=1` }) } else if(e.currentTarget.id == 'message'){ - util.navigateTo('/pages/message/index/index') + util.navigateTo('/pages/html/message/index') } }, tapBanner: function(e){ diff --git a/pages/message/index.wxs b/pages/message/index.wxs deleted file mode 100644 index 35a0a5d..0000000 --- a/pages/message/index.wxs +++ /dev/null @@ -1,28 +0,0 @@ -function isEmpty(val) { - return typeof val === 'undefined' || val === '' || val === null -} - -function formateDate(datetime) { - if (isEmpty(datetime)) { - return '' - } - var dayCode = 24 * 60 * 60 * 1000 - datetime = datetime.replace(getRegExp('/\s/g', 'g'), '') - var date = getDate(datetime.trim()) - var today = getDate() - var yestoday = getDate(getDate().getTime() - dayCode) - var week = '' - if (date.getFullYear() === today.getFullYear() && date.getMonth() === today.getMonth() && date.getDate() === today.getDate()) { - week = '今天 ' + datetime.substring(10) - } else if (date.getFullYear() === yestoday.getFullYear() && date.getMonth() === yestoday.getMonth() && date.getDate() === yestoday.getDate()) { - week = '昨天 ' + datetime.substring(10) - } - if (isEmpty(week)) { - return datetime - } - return week -} - -module.exports = { - formateDate: formateDate -} \ No newline at end of file diff --git a/utils/util.js b/utils/util.js index d9e681d..5ec5075 100644 --- a/utils/util.js +++ b/utils/util.js @@ -169,7 +169,7 @@ const tokenList = [ '/pages/shop/index/index', '/submodel/pages/bidding/index/index', '/submodel/pages/morder/index/index', - '/pages/message/index/index', + '/pages/html/message/index', '/pages/home/setting/index', '/submodel/pages/address/list/index', '/pages/article/list/index', @@ -219,7 +219,7 @@ function navigateTarget(redirectInfo){ } else if(redirectInfo.targetView == 'myArticle'){ navigateTo('/pages/article/list/index') } else if(redirectInfo.targetView == 'myMessage'){ - navigateTo('/pages/message/index/index') + navigateTo('/pages/html/message/index') } else if(redirectInfo.targetView == 'member'){ navigateTo('/pages/ztbvip/index') } else if(redirectInfo.targetView == 'showPurchaseList'){