Browse Source

v1.6.17 修复消息通知中拼团购无法打开详情的BUG;一键服务视频列表默认显示视频标题;

feature/point
ZhaoTongYao 5 years ago
parent
commit
f02d6e3056
  1. 3
      app.json
  2. 2
      pages/toRegister/toRegister.js
  3. 6
      subpages/home/pages/info/info.js
  4. 2
      subpages/home/pages/info/info.wxml
  5. 101
      subpages/home/pages/messageDetail/messageDetail.js
  6. 4
      subpages/home/pages/messageDetail/messageDetail.json
  7. 39
      subpages/home/pages/messageDetail/messageDetail.wxml
  8. 55
      subpages/home/pages/messageDetail/messageDetail.wxss
  9. 2
      subpages/oneKeyService/pages/moduleList/moduleList.js
  10. 13
      utils/home.js

3
app.json

@ -29,7 +29,8 @@
"pages/info/info",
"pages/noticeDetail/noticeDetail",
"pages/newsDetail/newsDetail",
"pages/newsList/newsList"
"pages/newsList/newsList",
"pages/messageDetail/messageDetail"
]
},
{

2
pages/toRegister/toRegister.js

@ -21,7 +21,7 @@ Page({
// }
// })
let that = this
const versionNum = "1.6.16"
const versionNum = "1.6.17"
api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data)
let state = res.data.scanFlag

6
subpages/home/pages/info/info.js

@ -42,7 +42,7 @@ Page({
},
lookDetail (e) {
console.log("item", e.currentTarget.dataset.item)
const { id: infoId, businessId: issueId, type, businessType, relBusinessContent, title, content } = e.currentTarget.dataset.item
const { id: infoId, businessId: issueId, type, businessType, relBusinessContent, title, content, time } = e.currentTarget.dataset.item
console.log("businessType", businessType)
let params = {
informationId: infoId
@ -116,6 +116,10 @@ Page({
wx.navigateTo({
url: `/subpages/heart/pages/noticeDetail/noticeDetail?title=${title}&content=${content}`
})
} else if (businessType.indexOf('sds') > -1 || businessType.indexOf('ptg') > -1) { //顺道捎加单号
wx.navigateTo({
url: `/subpages/home/pages/messageDetail/messageDetail?id=${issueId}&type=${businessType}&content=${content}&time=${time}`
})
}
} else if (type === "2") {
if (businessType === "topicToIssuePass") {

2
subpages/home/pages/info/info.wxml

@ -30,7 +30,7 @@
<view class="title">{{item.title}}</view>
<view class="time">{{item.time}}</view>
<view class="content">{{item.content}}</view>
<view wx:if='{{item.businessType != "points"}}' class="remark">{{item.relBusinessContent}}</view>
<view wx:if='{{item.businessType != "points" && item.relBusinessContent}}' class="remark">{{item.relBusinessContent}}</view>
</view>
</view>
<view class="info-item" wx:if="{{item.type=='3'}}" data-item="{{item}}" bindtap="lookDetail">

101
subpages/home/pages/messageDetail/messageDetail.js

@ -0,0 +1,101 @@
// subpages/heart/pages/noticeNewDetail/noticeNewDetail.js
const api = require("../../../../utils/home")
Page({
/**
* 页面的初始数据
*/
data: {
noticeId: '',
noticeType: '', //0,2 顺道捎 1,3 拼团购
details: {},
content: '', //屏蔽原因
time: '', //屏蔽时间
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.setData({
noticeId: options.id,
noticeType: options.type,
content: options.content,
time: options.time
})
this.getNoticeDetail()
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
// onShareAppMessage: function () {
// },
getNoticeDetail () {
wx.showLoading({
title: '加载中...'
})
if (this.data.noticeType == 'sds') {
api.getSdsDetail(this.data.noticeId).then(res => {
// console.log(res.data)
wx.hideLoading()
this.setData({
details: res.data
})
})
} else {
api.getGroupBuyDetail(this.data.noticeId).then(res => {
// console.log(res.data)
wx.hideLoading()
this.setData({
details: res.data
})
})
}
}
})

4
subpages/home/pages/messageDetail/messageDetail.json

@ -0,0 +1,4 @@
{
"navigationBarTitleText": "详情",
"usingComponents": {}
}

39
subpages/home/pages/messageDetail/messageDetail.wxml

@ -0,0 +1,39 @@
<!--subpages/heart/pages/noticeNewDetail/noticeNewDetail.wxml-->
<view class="notice-new">
<view class="notice-detail" wx:if="{{noticeType == 'sds'}}">
<view class="apply-item">
<view class="item-title">标题</view>
<view class="item-content">{{details.departure}} 到 {{details.destination}}</view>
</view>
<view class="apply-item">
<view class="item-title">内容</view>
<view class="item-content">{{details.carryContent}}</view>
</view>
<view class="apply-item">
<view class="item-title">消息时间</view>
<view class="item-content">{{time}}</view>
</view>
<view class="apply-item">
<view class="item-title">消息内容</view>
<view class="item-content">{{content}}</view>
</view>
</view>
<view class="notice-detail" wx:else>
<view class="apply-item">
<view class="item-title">标题</view>
<view class="item-content">{{details.groupBuyTitle}}</view>
</view>
<view class="apply-item">
<view class="item-title">内容</view>
<view class="item-content">{{details.groupBuyContent}}</view>
</view>
<view class="apply-item">
<view class="item-title">消息时间</view>
<view class="item-content">{{time}}</view>
</view>
<view class="apply-item">
<view class="item-title">消息内容</view>
<view class="item-content">{{content}}</view>
</view>
</view>
</view>

55
subpages/home/pages/messageDetail/messageDetail.wxss

@ -0,0 +1,55 @@
/* subpages/heart/pages/noticeNewDetail/noticeNewDetail.wxss */
page {
width: 100%;
height: auto;
overflow-y: auto;
background: #f7f7f7;
}
.notice-detail {
margin-bottom: 60rpx;
}
.notice-detail .apply-item {
width: 100%;
background-color: white;
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: center;
padding: 40rpx 30rpx;
margin-top: 16rpx;
box-sizing: border-box;
}
.notice-detail .apply-item .item-title {
font-size: 32rpx;
font-family: PingFang SC;
font-weight: bold;
color: #333333;
}
.notice-detail .apply-item .item-content {
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500;
color: #666666;
margin-top: 28rpx;
}
.notice-detail .apply-item .item-mobile {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
}
.notice-detail .apply-item .item-mobile .call-img {
width: 176rpx;
height: 76rpx;
}
.notice-detail .apply-item .item-mobile .call-img image{
width: 100%;
height: 100%;
}
.notice-detail .apply-item .line {
width: 100%;
height: 1px;
background: #F2F2F2;
border-radius: 1px;
margin: 28rpx 0rpx;
}

2
subpages/oneKeyService/pages/moduleList/moduleList.js

@ -147,7 +147,7 @@ Page({
list = []
res.data.forEach(item => {
if (item.noticeVideoUrl) {
item.showTitle = false
item.showTitle = true
list.push(item)
}
})

13
utils/home.js

@ -10,7 +10,9 @@ module.exports = {
infoDetail: infoDetail,
newsSupport: newsSupport,
newsOpposition: newsOpposition,
browsePoints:browsePoints
browsePoints:browsePoints,
getSdsDetail: getSdsDetail,
getGroupBuyDetail: getGroupBuyDetail
}
function getNoticeList (param) {
return fly.get("news/notice/list", param)
@ -52,3 +54,12 @@ function infoDetail (param) {
function browsePoints (param) {
return fly.post("news/news/browsePoints", param)
}
//顺道捎-我需要捎我可以捎详情接口
function getSdsDetail (id) {
return fly.get(`custom/sds/getSdsDetail/${id}`)
}
//拼团购-详情接口
function getGroupBuyDetail (id) {
return fly.get(`custom/groupBuy/getGroupBuyDetail/${id}`)
}
Loading…
Cancel
Save