diff --git a/api/index.js b/api/index.js index f9d49e2..9273106 100644 --- a/api/index.js +++ b/api/index.js @@ -47,4 +47,7 @@ export function pay(data) { export function paySuccess(pamars) { return fly.get(`/bysmp/wx/paySuccess`,pamars) } - +// 分页查询消息 +export function message(pamars) { + return fly.get(`/bysmp/message/page`,pamars) +} diff --git a/components/loadMore/loadMore.js b/components/loadMore/loadMore.js new file mode 100644 index 0000000..cb75b8c --- /dev/null +++ b/components/loadMore/loadMore.js @@ -0,0 +1,13 @@ +"use strict"; +Component({ + properties: { + loadType: { + type: String, + value: 'more' + }, + loadVisible: { + type: Boolean, + value: false + } + } +}); diff --git a/components/loadMore/loadMore.json b/components/loadMore/loadMore.json new file mode 100644 index 0000000..bbde8dc --- /dev/null +++ b/components/loadMore/loadMore.json @@ -0,0 +1,3 @@ +{ + "component": true + } \ No newline at end of file diff --git a/components/loadMore/loadMore.wxml b/components/loadMore/loadMore.wxml new file mode 100644 index 0000000..683c7ae --- /dev/null +++ b/components/loadMore/loadMore.wxml @@ -0,0 +1,9 @@ + + + + 加载中... + + + 没有更多了~ + + \ No newline at end of file diff --git a/components/loadMore/loadMore.wxss b/components/loadMore/loadMore.wxss new file mode 100644 index 0000000..699ec9c --- /dev/null +++ b/components/loadMore/loadMore.wxss @@ -0,0 +1,33 @@ +.load-more { + width: 100%; + height: 100rpx; + } + + .load-more .more-data { + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + } + .load-more .more-data image { + width: 35rpx; + height: 35rpx; + margin-right: 10rpx; + } + .load-more .more-data .content { + font-size: 28rpx; + color: #999; + } + + .load-more .no-data { + width: 100%; + height: 100%; + text-align: center; + line-height: 100rpx; + } + .load-more .no-data .content { + font-size: 28rpx; + color: #999; + } + \ No newline at end of file diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index 40daacb..23e1dd9 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -16,12 +16,12 @@ Component({ selectedIconPath: "/images/icon/home-a.png", text: "首页", }, - // { - // pagePath: "/pages/message/message", - // iconPath: "/images/icon/message.png", - // selectedIconPath: "/images/icon/message-a.png", - // text: "消息", - // }, + { + pagePath: "/pages/message/message", + iconPath: "/images/icon/message.png", + selectedIconPath: "/images/icon/message-a.png", + text: "消息", + }, { pagePath: "/pages/serve/serve", iconPath: "/images/icon/serve.png", diff --git a/images/icon/notice.png b/images/icon/notice.png new file mode 100644 index 0000000..24fe297 Binary files /dev/null and b/images/icon/notice.png differ diff --git a/pages/index/index.js b/pages/index/index.js index 671c488..e0fc099 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -5,7 +5,8 @@ import { getUserInfo } from "../../api/user" import { - getPolicyList + getPolicyList, + message } from "../../api/index" Page({ /** @@ -51,6 +52,7 @@ Page({ ], searchValue: "", policyList:[],//政策列表 + getUserInfo:{} }, /** @@ -78,7 +80,8 @@ Page({ }) } that.getPolicyList() - + that.getMessage() + that.getUserInfo() }).catch(err => { console.log(err); }) @@ -103,6 +106,21 @@ Page({ url: '/subpages/index/policy/detail/detail?id=' + e.currentTarget.dataset.id, }) }, + getMessage(){ + message({pageNum:1,pageSize:1}).then(res=>{ + if(res.code === 200){ + console.log(res); + this.setData({ + messageList:res.data.records + }) + } + }) + }, + toMessage(){ + wx.switchTab({ + url: '/pages/message/message', + }) + }, /** * 生命周期函数--监听页面初次渲染完成 */ @@ -141,16 +159,9 @@ Page({ getUserInfo().then(res=>{ // 有身份证号直接去信息确认没有的话就去识别身份证信息 app.globalData.userInfo = res.data; - if(res.data.idCard){ - wx.navigateTo({ - url: `/subpages/index/checkInUser/checkInUser?idCard=${res.data.idCard}`, - }) - }else{ - wx.navigateTo({ - url: `/subpages/OCRCard/pages/index/index`, - }) - - } + this.setData({ + userInfo:res.data + }) }) }, navigateTo(e){ @@ -164,7 +175,15 @@ Page({ url: e.currentTarget.dataset.url, }) }else if(e.currentTarget.dataset.url){ - this.getUserInfo() + if(this.data.userInfo.idCard){ + wx.navigateTo({ + url: `/subpages/index/checkInUser/checkInUser?idCard=${res.data.idCard}`, + }) + }else{ + wx.navigateTo({ + url: `/subpages/OCRCard/pages/index/index`, + }) + } } } }); \ No newline at end of file diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 350ab01..bc7dcb8 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -14,9 +14,9 @@ - + Image - 青岛人彩棉租住房申请条件的先骨干说明 + {{messageList[0].title || ''}} { + this.setData({ + loadMoreType: res.data.records.length === this.data.pageSize ? 'more' : 'none', + tableData: this.data.tableData.concat(res.data.records), + }) + if (this.data.tableData.length == 0) { + this.setData({ + loadMoreVisible: false, + nodata: true + }) + } + }).catch(err=>{ + console.log(err); + this.setData({ + loadMoreVisible: false, + nodata: true, + }) + }) + }, + + + + handelClickClear(){ + clearMessage().then(res=>{ + this.setData({ + tableData:[], + pageNo:1 + }) + this.getIntelligentMessage() + }).catch(err=>{ + console.log(err); + }) + }, +}) - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - } -}) \ No newline at end of file diff --git a/pages/message/message.json b/pages/message/message.json index 3928faa..11bfed0 100644 --- a/pages/message/message.json +++ b/pages/message/message.json @@ -1,3 +1,10 @@ { - "usingComponents": {} + "usingComponents": { + "load-more": "/components/loadMore/loadMore", + "van-empty": "@vant/weapp/empty/index" + }, + "navigationBarTitleText": "消息", + "enablePullDownRefresh": true, + "backgroundColor": "#f8f8f8", + "backgroundTextStyle": "dark" } \ No newline at end of file diff --git a/pages/message/message.wxml b/pages/message/message.wxml index 5bbb092..0225319 100644 --- a/pages/message/message.wxml +++ b/pages/message/message.wxml @@ -1,2 +1,25 @@ - -pages/message/message.wxml \ No newline at end of file + + + + + + + + + {{item.title}} + {{item.createTime}} + + + + {{item.content}} + + + + + + + + + + + \ No newline at end of file diff --git a/pages/message/message.wxss b/pages/message/message.wxss index 2251458..6a3429f 100644 --- a/pages/message/message.wxss +++ b/pages/message/message.wxss @@ -1 +1,153 @@ -/* pages/message/message.wxss */ \ No newline at end of file +page { + width: 100%; + min-height: 100vh; + overflow: hidden; + background-color: #f7f7f7; + } + + .select{ + width: 100%; + height: 90rpx; + background-color: #fff; + display: flex; + justify-content: space-between; + box-sizing: border-box; + padding: 0 40rpx; + align-items: center; + } + .select view { + display: flex; + align-items: center; + font-size: 30rpx; + font-family: PingFang SC; + font-weight: 500; + color: #3A80E7; + } + .select view image{ + width: 16rpx; + height: 16rpx; + margin: 0 9rpx; + } + .select .delete { + font-size: 28rpx; + font-family: PingFang SC; + font-weight: 500; + color: #999999; + } + .select .delete image{ + width: 30rpx; + height: 30rpx; + } + .content{ + width: 100%; + padding:0 20rpx ; + margin-top: 20rpx; + box-sizing: border-box; + } + .content .scroll { + height: calc(100vh - 130rpx); + } + + .content .scroll .box{ + border-radius: 20rpx; + overflow-y: auto; + } + .content .card{ + width: 100%; + background-color: #fff; + display: flex; + padding: 20rpx 30rpx; + box-sizing: border-box; + overflow: hidden; + position: relative; + } + + .content .card::before{ + content: ""; + position: absolute; + left: 30rpx; /* 调整间距 */ + right: 30rpx; /* 调整间距 */ + bottom: 0; + border-bottom: 2rpx solid #EAEAEA; + } + + .blue{ + color:#5693EE; + } + .yellow{ + color:#E2944D; + } + .cyan{ + color: #2EB4F2 ; + } + .cyanBg{ + background: rgba(56,189,253,0.1); + } + .yellowBg{ + background: rgba(248,188,122,0.1); + } + .blueBg{ + background: rgba(86,147,238,0.1); + } + .gray{ + color: #999999 !important; + } + + .content .card .right{ + flex: 1; + overflow: hidden; + display: flex; + flex-direction: column; + justify-content: space-between; + overflow: hidden; + + } + .content .card .right .top{ + display: flex; + align-items: center; + justify-content: space-between; + } + .content .card .right .title{ + font-size: 32rpx; + font-weight: 300; + overflow: hidden; + font-weight: 600; + text-overflow: ellipsis; + white-space: nowrap; + width: calc(100% - 250rpx); + } + + + .content .card .right .bottom{ + display: flex; + justify-content: space-between; + align-items: center; + font-size: 28rpx; + font-family: PingFang SC; + color: #999999; + } + .textOver{ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + max-width: 250rpx; + font-weight: 300; + } + .content .card .right .bottom .flex_box{ + display: flex; + justify-content: left; + } + .left{ + margin-right: 28rpx; + } + .bgBule{ + background-color: #dfebfb; + border: 1px solid #3A80E7; + border-radius: 32rpx; + padding:10rpx 20rpx; + box-sizing: border-box; + } + .bgBule image{ + margin-left: 50rpx !important; + } + \ No newline at end of file diff --git a/subpages/index/checkInUser/checkInUser.js b/subpages/index/checkInUser/checkInUser.js index f7550ed..276a5e1 100644 --- a/subpages/index/checkInUser/checkInUser.js +++ b/subpages/index/checkInUser/checkInUser.js @@ -40,19 +40,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - if(this.data.form){ - const pamars = { - bizId:this.data.form.chooseRecId || '', - signType:1 - } - eSignDownload(pamars).then(res=>{ - if(res.data.code === 0){ - wx.navigateTo({ - url: '/subpages/OCRCard/pages/deposit/deposit', - }) - } - }) - } + }, /** diff --git a/subpages/index/checkInWait/checkInWait.js b/subpages/index/checkInWait/checkInWait.js index 7ecb061..ab36522 100644 --- a/subpages/index/checkInWait/checkInWait.js +++ b/subpages/index/checkInWait/checkInWait.js @@ -33,19 +33,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - if(this.data.info){ - const pamars = { - bizId:this.data.info.chooseRecId ||'', - signType:1 - } - eSignDownload(pamars).then(res=>{ - if(res.data.code === 0){ - wx.navigateTo({ - url: '/subpages/OCRCard/pages/deposit/deposit', - }) - } - }) - } + }, /**