From f02d6e3056322ee76f5b6d60f4a8cc934782b9a3 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 12 Jan 2021 16:24:24 +0800 Subject: [PATCH] =?UTF-8?q?v1.6.17=20=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=B8=AD=E6=8B=BC=E5=9B=A2=E8=B4=AD=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=89=93=E5=BC=80=E8=AF=A6=E6=83=85=E7=9A=84BUG?= =?UTF-8?q?=EF=BC=9B=E4=B8=80=E9=94=AE=E6=9C=8D=E5=8A=A1=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E6=A0=87=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 3 +- pages/toRegister/toRegister.js | 2 +- subpages/home/pages/info/info.js | 6 +- subpages/home/pages/info/info.wxml | 2 +- .../home/pages/messageDetail/messageDetail.js | 101 ++++++++++++++++++ .../pages/messageDetail/messageDetail.json | 4 + .../pages/messageDetail/messageDetail.wxml | 39 +++++++ .../pages/messageDetail/messageDetail.wxss | 55 ++++++++++ .../pages/moduleList/moduleList.js | 2 +- utils/home.js | 13 ++- 10 files changed, 221 insertions(+), 6 deletions(-) create mode 100644 subpages/home/pages/messageDetail/messageDetail.js create mode 100644 subpages/home/pages/messageDetail/messageDetail.json create mode 100644 subpages/home/pages/messageDetail/messageDetail.wxml create mode 100644 subpages/home/pages/messageDetail/messageDetail.wxss diff --git a/app.json b/app.json index cb6a589..d195bee 100644 --- a/app.json +++ b/app.json @@ -29,7 +29,8 @@ "pages/info/info", "pages/noticeDetail/noticeDetail", "pages/newsDetail/newsDetail", - "pages/newsList/newsList" + "pages/newsList/newsList", + "pages/messageDetail/messageDetail" ] }, { diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index d0e92e8..df2cdb4 100644 --- a/pages/toRegister/toRegister.js +++ b/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 diff --git a/subpages/home/pages/info/info.js b/subpages/home/pages/info/info.js index 7711012..f9f1160 100644 --- a/subpages/home/pages/info/info.js +++ b/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") { diff --git a/subpages/home/pages/info/info.wxml b/subpages/home/pages/info/info.wxml index 4a960dd..211d611 100644 --- a/subpages/home/pages/info/info.wxml +++ b/subpages/home/pages/info/info.wxml @@ -30,7 +30,7 @@ {{item.title}} {{item.time}} {{item.content}} - {{item.relBusinessContent}} + {{item.relBusinessContent}} diff --git a/subpages/home/pages/messageDetail/messageDetail.js b/subpages/home/pages/messageDetail/messageDetail.js new file mode 100644 index 0000000..0d8e354 --- /dev/null +++ b/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 + }) + }) + } + } +}) \ No newline at end of file diff --git a/subpages/home/pages/messageDetail/messageDetail.json b/subpages/home/pages/messageDetail/messageDetail.json new file mode 100644 index 0000000..61f0f4a --- /dev/null +++ b/subpages/home/pages/messageDetail/messageDetail.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "详情", + "usingComponents": {} +} \ No newline at end of file diff --git a/subpages/home/pages/messageDetail/messageDetail.wxml b/subpages/home/pages/messageDetail/messageDetail.wxml new file mode 100644 index 0000000..405633d --- /dev/null +++ b/subpages/home/pages/messageDetail/messageDetail.wxml @@ -0,0 +1,39 @@ + + + + + 标题 + {{details.departure}} 到 {{details.destination}} + + + 内容 + {{details.carryContent}} + + + 消息时间 + {{time}} + + + 消息内容 + {{content}} + + + + + 标题 + {{details.groupBuyTitle}} + + + 内容 + {{details.groupBuyContent}} + + + 消息时间 + {{time}} + + + 消息内容 + {{content}} + + + diff --git a/subpages/home/pages/messageDetail/messageDetail.wxss b/subpages/home/pages/messageDetail/messageDetail.wxss new file mode 100644 index 0000000..dedefbb --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/subpages/oneKeyService/pages/moduleList/moduleList.js b/subpages/oneKeyService/pages/moduleList/moduleList.js index 1f10de2..b81fdc3 100644 --- a/subpages/oneKeyService/pages/moduleList/moduleList.js +++ b/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) } }) diff --git a/utils/home.js b/utils/home.js index fa1a631..5c8f5fc 100644 --- a/utils/home.js +++ b/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) @@ -51,4 +53,13 @@ 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}`) } \ No newline at end of file