diff --git a/pages/index/index.js b/pages/index/index.js index 9369c25..84b71cf 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -251,9 +251,9 @@ Page({ } }, onEvent: function (message) { - // if(message.what == 250){ - // this.setData({ pageIndex: 0 }) - // } + if(message.what == 223){ + this.setData({ landInfo: {otherType: 11, picUrl: '/assets/popup/need-member.png'} }) + } }, stopTouchMove: function (e) { return false diff --git a/pages/moment/moment-item/index.js b/pages/moment/moment-item/index.js index fb8d406..4bbcdf9 100644 --- a/pages/moment/moment-item/index.js +++ b/pages/moment/moment-item/index.js @@ -1,4 +1,5 @@ const util = require('../../../utils/util') +const event = require('../../../utils/event') import { userPushFollowMill } from "../../../api/ztb" import { getMillPaperList } from "../../../api/moment" const app = getApp() @@ -20,6 +21,12 @@ Component({ }, methods: { onFlodTap: function(){ + if(this.data.item.isCooperate === 1) { + if(!app.globalData.userInfo || !app.globalData.userInfo.isVIP){ + event.emit('EventMessage', {what: 223, desc: 'Logout'}) + return + } + } this.setData({ unflod: !this.data.unflod }) if(!this.data.itemList.length && this.data.unflod){ this.fetchItemList() @@ -41,12 +48,6 @@ Component({ }) }, lookItem: function(e){ - if(!this.data.item.isCooperate) { - if(!app.globalData.userInfo){ - util.navigateTo('/pages/login/index') - return - } - } util.navigateTo('/pages/agent/factory/index?id=' + this.data.item.paperMillId) }, fetchItemList: function(){