From 305df50cd863cb0892a0dd8d0e94da2dcafabff2 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Mon, 12 Apr 2021 22:06:35 +0800 Subject: [PATCH] no message --- app.js | 6 ++-- pages/message/index/index.js | 50 ++++++----------------------- pages/message/index/index.wxml | 1 - pages/message/notification/index.js | 17 +++++++--- 4 files changed, 26 insertions(+), 48 deletions(-) diff --git a/app.js b/app.js index 473285d..105394b 100644 --- a/app.js +++ b/app.js @@ -5,12 +5,14 @@ App({ version: 152, xAppId: '503258978847953926', userInfo: null, - msgIdList: [], + //----------------------------------------------globalData-------------------------------------- globalData: { token: null, agenting: 1, keyboardHeight: 0, - isIos: false + isIos: false, + msgIdList: [], + msgNumber: 0 } }) \ No newline at end of file diff --git a/pages/message/index/index.js b/pages/message/index/index.js index c454b9e..4751224 100644 --- a/pages/message/index/index.js +++ b/pages/message/index/index.js @@ -1,4 +1,4 @@ -// import { getCategoryList, getProductList } from "../../api/mall" +import { getMessageList } from "../../../api/saas" const event = require('../../../utils/event') const util = require('../../../utils/util') const app = getApp() @@ -13,21 +13,18 @@ Component({ */ data: { height: app.globalData.safeFragmentHeight - 100, - CustomBar: app.globalData.CustomBar, userInfo: null, firstShow: false, - tabIndex: 0, - tabList: [], loading: false, requesting: false, finished: false, top: 0, orderList: [], - form: { categoryId: '', pageNum: 1, pageSize: 10 } + form: { productType: 'ZTB_FACTORY', pageNum: 1, pageSize: 10 } }, lifetimes: { - // 生命周期函数，可以为函数，或一个在methods段中定义的方法名 attached: function () { + this.setData({ height: app.globalData.safeFragmentHeight - 100 }) event.on('EventMessage', this, this.onEvent) }, detached: function () { @@ -39,32 +36,17 @@ Component({ if (this.data.firstShow) { return } - this.setData({ height: app.globalData.safeFragmentHeight - 100, CustomBar: app.globalData.CustomBar }) - // this.fetchCategoryList() - // this.fetchList() + this.fetchList() this.data.firstShow = true }, onEvent: function (message) { if (message.what == 888) { this.setData({ userInfo: app.accountInfo }) } - }, - fetchCategoryList: function(){ - getCategoryList().then(result => { - this.setData({ tabList: [{id: '', name: '全部'}].concat(result.data) }) - }) - }, - onTabChange: function ({detail}) { - if (this.data.tabIndex == Number(detail.index)) { - return - } - this.setData({ tabIndex: detail.index}) - this.data.form.categoryId = this.data.tabList[this.data.tabIndex].id - this.onRefreshList() }, onRefreshList: function () { - // this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false }) - // this.fetchList() + this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false }) + this.fetchList() }, fetchList: function () { if (this.data.requesting || this.data.finished) { @@ -75,35 +57,21 @@ Component({ } else { this.setData({ requesting: true }) } - getProductList(this.data.form).then(result => { + getMessageList(this.data.form).then(result => { if (result.data.records.length) { var respList = result.data.records let nowList = `orderList[${this.data.orderList.length}]` var num = this.data.form.pageNum var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total if(this.data.form.pageNum == 1){ - this.setData({ - [nowList]: respList, - ['form.pageNum']: (num + 1), - top: 0, - finished, - requesting: false, - loading: false - }) + this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), top: 0, finished, requesting: false, loading: false }) } else { - this.setData({ - [nowList]: respList, - ['form.pageNum']: (num + 1), - finished, - requesting: false, - loading: false - }) + this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) } } else { this.setData({ finished: true, requesting: false, loading: false }) } }).catch(err => { - //异常回调 this.setData({ requesting: false, loading: false }) util.showToast(err) }) diff --git a/pages/message/index/index.wxml b/pages/message/index/index.wxml index e42a796..7f2cf86 100644 --- a/pages/message/index/index.wxml +++ b/pages/message/index/index.wxml @@ -4,7 +4,6 @@ - diff --git a/pages/message/notification/index.js b/pages/message/notification/index.js index 6627745..8561283 100644 --- a/pages/message/notification/index.js +++ b/pages/message/notification/index.js @@ -12,12 +12,12 @@ Component({ StatusBar: app.globalData.StatusBar, CustomBar: app.globalData.CustomBar, notice: false, - message: null + message: null, + numb: 0 }, lifetimes: { - // 生命周期函数，可以为函数，或一个在methods段中定义的方法名 attached: function () { - this.setData({ StatusBar: app.globalData.StatusBar || 40, CustomBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 60), }) + this.setData({ StatusBar: app.globalData.StatusBar, CustomBar: app.globalData.CustomBar }) } }, methods: { @@ -25,6 +25,15 @@ Component({ if(this.data.notice){ return } + var index = app.globalData.msgIdList.indexOf(message.id) + if(index >= 0){ + app.globalData.msgNumber += 1 + if(app.globalData.msgNumber >= 60){ + app.globalData.msgIdList.splice(index, 1); + } + return + } + app.globalData.msgNumber = 0 this.setData({ notice: true, message }) }, submit: function(e){ @@ -32,7 +41,7 @@ Component({ return } if(util.isEmpty(e.currentTarget.id)){ - + app.globalData.msgIdList.push(this.data.message.id) this.setData({ notice: false }) return }