Browse Source

no message

featrue/v4.5
xpz2018 4 years ago
parent
commit
00a7ea4bda
9 changed files with 35 additions and 38 deletions
  1. 2
      app.json
  2. 2
      pages/home/index/index.js
  3. 0
      pages/html/message/index.js
  4. 0
      pages/html/message/index.json
  5. 35
      pages/html/message/index.wxml
  6. 0
      pages/html/message/index.wxss
  7. 2
      pages/mall/fragment/index.js
  8. 28
      pages/message/index.wxs
  9. 4
      utils/util.js

2
app.json

@ -53,7 +53,7 @@
"pages/purchase/index/index", "pages/purchase/index/index",
"pages/purchase/create/index", "pages/purchase/create/index",
"pages/purchase/detail/index", "pages/purchase/detail/index",
"pages/message/index/index",
"pages/html/message/index",
"pages/html/banner/index", "pages/html/banner/index",
"pages/html/html/index", "pages/html/html/index",
"pages/html/notice/index", "pages/html/notice/index",

2
pages/home/index/index.js

@ -100,7 +100,7 @@ Component({
} else if (e.currentTarget.id == 'agent') { } else if (e.currentTarget.id == 'agent') {
util.navigateTo('/pages/agent/order/index') util.navigateTo('/pages/agent/order/index')
} else if (e.currentTarget.id == 'message') { } else if (e.currentTarget.id == 'message') {
util.navigateTo('/pages/message/index/index')
util.navigateTo('/pages/html/message/index')
} else if (e.currentTarget.id == 'balance') { } else if (e.currentTarget.id == 'balance') {
util.navigateTo('/pages/withdrawal/balance/index') util.navigateTo('/pages/withdrawal/balance/index')
} else if (e.currentTarget.id == 'integral') { } else if (e.currentTarget.id == 'integral') {

pages/message/index/index.js → pages/html/message/index.js

pages/message/index/index.json → pages/html/message/index.json

pages/message/index/index.wxml → pages/html/message/index.wxml

@ -1,5 +1,3 @@
<!--pages/message/index/index.wxml-->
<wxs module="message" src="../../message/index.wxs"></wxs>
<cu-custom bgColor="bg-white" isBack="{{true}}"> <cu-custom bgColor="bg-white" isBack="{{true}}">
<view slot="content" style="color:black;font-size:18px">消息</view> <view slot="content" style="color:black;font-size:18px">消息</view>
</cu-custom> </cu-custom>
@ -34,14 +32,13 @@
<view class="flex flex-justify"> <view class="flex flex-justify">
<view class="text-sg text-bold">[{{item.categoryName}}]</view> <view class="text-sg text-bold">[{{item.categoryName}}]</view>
<view class="text-sm text-gray"> <view class="text-sm text-gray">
<wux-badge dot="{{item.status === 0}}">{{message.formateDate(item.createTime)}}</wux-badge>
<wux-badge dot="{{item.status === 0}}">{{formateDate(item.createTime)}}</wux-badge>
</view> </view>
</view> </view>
<view class="text-df" style="margin-top:18rpx">{{item.content}}</view> <view class="text-df" style="margin-top:18rpx">{{item.content}}</view>
</view> </view>
</view> </view>
</view> </view>
<!--加载更多的UI-->
<view wx:if="{{form.pageNum>1}}" style="padding:20rpx"> <view wx:if="{{form.pageNum>1}}" style="padding:20rpx">
<wux-divider> <wux-divider>
<view class="loadmore"> <view class="loadmore">
@ -51,4 +48,32 @@
</wux-divider> </wux-divider>
</view> </view>
</view> </view>
</refresh-view>
</refresh-view>
<wxs module="formateDate">
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
</wxs>

pages/message/index/index.wxss → pages/html/message/index.wxss

2
pages/mall/fragment/index.js

@ -122,7 +122,7 @@ Component({
} else if(e.currentTarget.id == 'city'){ } else if(e.currentTarget.id == 'city'){
wx.navigateTo({url: `/pages/home/city-select/index?type=1` }) wx.navigateTo({url: `/pages/home/city-select/index?type=1` })
} else if(e.currentTarget.id == 'message'){ } else if(e.currentTarget.id == 'message'){
util.navigateTo('/pages/message/index/index')
util.navigateTo('/pages/html/message/index')
} }
}, },
tapBanner: function(e){ tapBanner: function(e){

28
pages/message/index.wxs

@ -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
}

4
utils/util.js

@ -169,7 +169,7 @@ const tokenList = [
'/pages/shop/index/index', '/pages/shop/index/index',
'/submodel/pages/bidding/index/index', '/submodel/pages/bidding/index/index',
'/submodel/pages/morder/index/index', '/submodel/pages/morder/index/index',
'/pages/message/index/index',
'/pages/html/message/index',
'/pages/home/setting/index', '/pages/home/setting/index',
'/submodel/pages/address/list/index', '/submodel/pages/address/list/index',
'/pages/article/list/index', '/pages/article/list/index',
@ -219,7 +219,7 @@ function navigateTarget(redirectInfo){
} else if(redirectInfo.targetView == 'myArticle'){ } else if(redirectInfo.targetView == 'myArticle'){
navigateTo('/pages/article/list/index') navigateTo('/pages/article/list/index')
} else if(redirectInfo.targetView == 'myMessage'){ } else if(redirectInfo.targetView == 'myMessage'){
navigateTo('/pages/message/index/index')
navigateTo('/pages/html/message/index')
} else if(redirectInfo.targetView == 'member'){ } else if(redirectInfo.targetView == 'member'){
navigateTo('/pages/ztbvip/index') navigateTo('/pages/ztbvip/index')
} else if(redirectInfo.targetView == 'showPurchaseList'){ } else if(redirectInfo.targetView == 'showPurchaseList'){

Loading…
Cancel
Save