diff --git a/pages/home/noticeDetail/noticeDetail.js b/pages/home/noticeDetail/noticeDetail.js index be769d0..51a3b78 100644 --- a/pages/home/noticeDetail/noticeDetail.js +++ b/pages/home/noticeDetail/noticeDetail.js @@ -7,20 +7,24 @@ Page({ dynamic_id: '', //活动id info: '', //详情信息 - loaded: false, - company_id: wx.getStorageSync('company_id'), + loaded: false }, onLoad(e) { this.setData({ dynamic_id: e.id }) - this.dynamicsDetail(); + wx.getStorage({ + key: 'company_id', + success: res=>{ + this.dynamicsDetail(res.data); + } + }) }, /** * 获取详情 */ - dynamicsDetail() { - wx.$api.companyModule.dynamicsDetail(this.data.company_id, this.data.dynamic_id).then(res => { + dynamicsDetail(companyId) { + wx.$api.companyModule.dynamicsDetail(companyId, this.data.dynamic_id).then(res => { if (res.content) { var nodes = res.content.replace(' { + this.setData({ + isLogin:true + }) + this.userInfo(); + },fail:()=>{ } + }) }, userInfo() { wx.$api.user.userInfo().then(res => { console.log(res); this.setData({ - info:res + info: res }) }) }, showtoast() { wx.showToast({ - title: '正在完善,看看其他的吧', - icon: 'none' + title: '正在完善,看看其他的吧', + icon: 'none' }) - } + }, + goLogin(){ + wx.navigateTo({ + url: '/pages/login/login', + }) + } }) \ No newline at end of file diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 77bdf3e..201a993 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -1,109 +1,116 @@ - - - - {{info.user.nickname}}{{info.vip.is_vip?'会员':'游客'}} - - - - - - {{info.counter.teams || 10}} 团队 - - {{info.counter.subscriptions}} 关注企业 - - - - 升级VIP会员 享会员特权 + + + + + {{info.user.nickname}}{{info.vip.is_vip?'会员':'游客'}} + - - 立即开通 + + + + {{info.counter.teams || 10}} 团队 + + {{info.counter.subscriptions}} 关注企业 + + + + 升级VIP会员 享会员特权 + + + 立即开通 + - - - - - + + + + + + 我的卡券 + + + + + + 我的订单 + + + + + + 分享海报 - 我的卡券 - - - - - - 我的订单 - - - - - - 分享海报 - - - - 更多服务 - - - - - - - 活动参与 - - - - - - 项目预购 - - - - - 2 - - 我的购物车 - - - - 客服服务 + + + 更多服务 - - - + + + + + + 活动参与 + + + + + + 项目预购 + + + + + {{info.cart_counts}} + + 我的购物车 + + + + 客服服务 - 收货地址 - - - - - - 项目关注 - - - - - - 区块链证书 - - - - - - 企获客广场 - - - - - - 设置 - + + + + + 收货地址 + + + + + + 项目关注 + + + + + + 区块链证书 + + + + + + 企获客广场 + + + + + + 设置 + + - - \ No newline at end of file + + + + 去登陸 + \ No newline at end of file diff --git a/project.config.json b/project.config.json index ecc1415..75c1f9a 100644 --- a/project.config.json +++ b/project.config.json @@ -90,12 +90,6 @@ "query": "orderid=20201229132338964625", "scene": null }, - { - "name": "pages/user/companyMine/companyOrder", - "pathName": "pages/user/companyMine/companyOrder", - "query": "orderid=20201229132338964625", - "scene": null - }, { "name": "pages/user/companyMine/projectDetail/projectDetail", "pathName": "pages/user/companyMine/projectDetail/projectDetail", @@ -141,6 +135,7 @@ { "name": "pages/home/index", "pathName": "pages/home/index", + "query": "", "scene": null } ]