diff --git a/pages/mall/search-list/index.js b/pages/mall/search-list/index.js index 89c891d..6e424fd 100644 --- a/pages/mall/search-list/index.js +++ b/pages/mall/search-list/index.js @@ -2,7 +2,6 @@ import { getFactoryPrice, getProxyOrderList } from "../../../api/ztb" import { getPreferList, getInformationList } from "../../../api/moment" const storage = require('../../../utils/storage') const util = require('../../../utils/util') -const event = require('../../../utils/event') const tdsdk = require('../../../libs/tdweapp.js') const app = getApp() const limit = 8 @@ -51,12 +50,13 @@ Page({ this.setData({searchList: rearchStringList, keyIndex: 0 }) } } - event.on('EventMessage', this, this.onEvent) }, - onEvent: function (message) { - if(message.what == 223){ - this.setData({ visible: true }) - } + needVip: function () { + this.setData({ visible: true }) + }, + onImageClick: function(){ + this.setData({ visible: false }) + util.navigateTo('/pages/ztbvip/index') }, onClose: function(){ this.setData({ visible: false }) @@ -243,7 +243,6 @@ Page({ }, onUnload: function() { tdsdk.Page.onUnload() - event.remove('EventMessage', this) if(rearchStringList.length){ storage.put('mall-search', rearchStringList.toString()) } diff --git a/pages/mall/search-list/index.wxml b/pages/mall/search-list/index.wxml index 55304c2..bb1d7d4 100644 --- a/pages/mall/search-list/index.wxml +++ b/pages/mall/search-list/index.wxml @@ -48,7 +48,7 @@ - + diff --git a/pages/moment/attention/index.js b/pages/moment/attention/index.js index 998e966..998da82 100644 --- a/pages/moment/attention/index.js +++ b/pages/moment/attention/index.js @@ -69,6 +69,9 @@ Component({ onAttention: function({detail}){ this.onRefreshList() }, + needVip: function () { + event.emit('EventMessage', {what: 223, desc: 'needvip'}) + }, onRefreshList: function(e){ if(!app.globalData.userInfo && e){ wx.navigateTo({ url: '/pages/login/index' }) diff --git a/pages/moment/attention/index.wxml b/pages/moment/attention/index.wxml index 1f2e633..3734dda 100644 --- a/pages/moment/attention/index.wxml +++ b/pages/moment/attention/index.wxml @@ -21,7 +21,7 @@ - + diff --git a/pages/moment/moment-item/index.js b/pages/moment/moment-item/index.js index d40d1ba..458de6e 100644 --- a/pages/moment/moment-item/index.js +++ b/pages/moment/moment-item/index.js @@ -27,7 +27,7 @@ Component({ return } if(this.data.item.isCooperate === 1 && !app.globalData.userInfo.isVIP) { - event.emit('EventMessage', {what: 223, desc: 'needvip'}) + this.triggerEvent('vip', null) return } this.setData({ unflod: !this.data.unflod }) diff --git a/pages/moment/recommend/index.js b/pages/moment/recommend/index.js index 056c7f5..038e0ef 100644 --- a/pages/moment/recommend/index.js +++ b/pages/moment/recommend/index.js @@ -59,6 +59,9 @@ Component({ this.data.form.date = date this.onRefreshList() }, + needVip: function () { + event.emit('EventMessage', {what: 223, desc: 'needvip'}) + }, onAttention: function({detail}){ event.emit('EventMessage', { what: 225}) }, diff --git a/pages/moment/recommend/index.wxml b/pages/moment/recommend/index.wxml index e1b9ffd..129c166 100644 --- a/pages/moment/recommend/index.wxml +++ b/pages/moment/recommend/index.wxml @@ -21,7 +21,7 @@ - + diff --git a/pages/moment/theall/index.js b/pages/moment/theall/index.js index 066acd1..c8f6b9e 100644 --- a/pages/moment/theall/index.js +++ b/pages/moment/theall/index.js @@ -65,6 +65,9 @@ Component({ } return proviceList }, + needVip: function () { + event.emit('EventMessage', {what: 223, desc: 'needvip'}) + }, onTabChange: function({ detail }){ if (this.data.tabIndex == Number(detail.index)) { return diff --git a/pages/moment/theall/index.wxml b/pages/moment/theall/index.wxml index eb050ec..0906c9f 100644 --- a/pages/moment/theall/index.wxml +++ b/pages/moment/theall/index.wxml @@ -27,7 +27,7 @@ - +