diff --git a/common/styles/iconfont.css b/common/styles/iconfont.css index 22fd06c..c31e8d9 100644 --- a/common/styles/iconfont.css +++ b/common/styles/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "lf-iconfont"; /* Project id 2779107 */ - src: url('//at.alicdn.com/t/font_2779107_uog0nj8djep.woff2?t=1631159318557') format('woff2'), - url('//at.alicdn.com/t/font_2779107_uog0nj8djep.woff?t=1631159318557') format('woff'), - url('//at.alicdn.com/t/font_2779107_uog0nj8djep.ttf?t=1631159318557') format('truetype'); + src: url('//at.alicdn.com/t/font_2779107_lm6jdc8nk3o.woff2?t=1631590134965') format('woff2'), + url('//at.alicdn.com/t/font_2779107_lm6jdc8nk3o.woff?t=1631590134965') format('woff'), + url('//at.alicdn.com/t/font_2779107_lm6jdc8nk3o.ttf?t=1631590134965') format('truetype'); } .lf-iconfont { @@ -13,80 +13,196 @@ -moz-osx-font-smoothing: grayscale; } -.icon-weixinzhifu:before { - content: "\e689"; +.icon-yingerche:before { + content: "\e603"; } -.icon-fabujilu:before { - content: "\e601"; +.icon-fenleiorguangchangorqitatianchong:before { + content: "\e67d"; +} + +.icon-jifen1:before { + content: "\e6a4"; +} + +.icon-tingchechang:before { + content: "\e6ca"; +} + +.icon-VIP:before { + content: "\e68e"; +} + +.icon-tubiao-:before { + content: "\e610"; } -.icon-dianpu:before { - content: "\e6b6"; +.icon-packing:before { + content: "\e625"; +} + +.icon-liwu:before { + content: "\e674"; +} + +.icon-activity-s:before { + content: "\e641"; +} + +.icon-peishi-shoubiao:before { + content: "\e60a"; +} + +.icon-shujia:before { + content: "\e620"; +} + +.icon-V:before { + content: "\e719"; } .icon-huiyuan2:before { + content: "\e731"; +} + +.icon-yinliao:before { + content: "\e60e"; +} + +.icon-meishi:before { + content: "\e611"; +} + +.icon-shuji:before { + content: "\fbb7"; +} + +.icon-jian1:before { + content: "\e633"; +} + +.icon-xiangxia:before { + content: "\e81c"; +} + +.icon-chakan:before { + content: "\e68a"; +} + +.icon-dizhi:before { + content: "\e606"; +} + +.icon-jifen:before { + content: "\e721"; +} + +.icon-xihuanlike:before { + content: "\e622"; +} + +.icon-pinglun:before { + content: "\e8b4"; +} + +.icon-pinglun-:before { + content: "\e60c"; +} + +.icon-shoucang2:before { + content: "\e629"; +} + +.icon-shoucang11:before { + content: "\e62a"; +} + +.icon-pinglun2:before { + content: "\f4bb"; +} + +.icon-xihuan:before { content: "\e640"; } -.icon-jilu2:before { - content: "\e65c"; +.icon-kefuhdpi:before { + content: "\e618"; } -.icon-shouye:before { - content: "\e636"; +.icon-tingche:before { + content: "\e8f8"; } -.icon-huiyuan3:before { - content: "\f0ae"; +.icon-gouwulan:before { + content: "\e64d"; } -.icon-shouye1:before { - content: "\e60a"; +.icon-jia:before { + content: "\e608"; } -.icon-xianxingicon-03:before { - content: "\e60d"; +.icon-yue:before { + content: "\e6b0"; } -.icon-shouye2:before { - content: "\e677"; +.icon-zhibo:before { + content: "\e8c1"; } -.icon-pinpai:before { - content: "\e664"; +.icon-zhiding:before { + content: "\e602"; } -.icon-yuebao:before { - content: "\e624"; +.icon-tongzhi:before { + content: "\ec1b"; } -.icon-pinpailiebiao:before { - content: "\e630"; +.icon-status-error:before { + content: "\e609"; } -.icon-tubiaozhizuomobandefuben-:before { - content: "\e61e"; +.icon-status-correct:before { + content: "\e60b"; } -.icon-huiyuan:before { - content: "\e65d"; +.icon-saoyisao:before { + content: "\e623"; } -.icon-Group-:before { - content: "\e6ae"; +.icon-weixinzhifu:before { + content: "\e689"; +} + +.icon-fabujilu:before { + content: "\e601"; +} + +.icon-jilu2:before { + content: "\e65c"; +} + +.icon-huiyuan3:before { + content: "\f0ae"; +} + +.icon-xianxingicon-03:before { + content: "\e60d"; +} + +.icon-yuebao:before { + content: "\e624"; } -.icon-Member:before { - content: "\e613"; +.icon-pinpailiebiao:before { + content: "\e630"; } -.icon-daishouhuo:before { - content: "\e651"; +.icon-huiyuan:before { + content: "\e65d"; } -.icon-shoucang1:before { - content: "\f49a"; +.icon-Group-:before { + content: "\e6ae"; } .icon-daifukuan:before { diff --git a/pages/discover/discover.vue b/pages/discover/discover.vue index 27f8e89..d15c481 100644 --- a/pages/discover/discover.vue +++ b/pages/discover/discover.vue @@ -12,11 +12,11 @@ - + V - 最新FUEJFEI + {{item.user.nick_name}} {{item.created_at}} @@ -27,16 +27,17 @@ - - + + + {{item.likes_count}} - + {{item.view_count}} - - + + {{item.comments_count}} @@ -49,15 +50,15 @@ :class="{'loading-more-text': tab.loadingClass}">{{ tab.loadingText }} - - - - - - + + + + + + @@ -99,6 +100,46 @@ this.getHotActivity() }, methods: { + goDetails(id) { + this.$url('/pages/discover/discoverdetails?discover_id='+id) + }, + addLike(id) { + this.$http + .post({ + api: 'api/discover/like', + data: { + discover_id: id + }, + header: { + Authorization: `Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjczYTViNTA1NDNlYmNmMjFkNmZiMGJlNzc0NmJmMDE4MDc3MTRkY2Y1MjBiMjM3MGQyZDAyYzQxMTlmMDU4ZTkwMTUxNDQwOTk4MjJhODFhIn0.eyJhdWQiOiIzIiwianRpIjoiNzNhNWI1MDU0M2ViY2YyMWQ2ZmIwYmU3NzQ2YmYwMTgwNzcxNGRjZjUyMGIyMzcwZDJkMDJjNDExOWYwNThlOTAxNTE0NDA5OTgyMmE4MWEiLCJpYXQiOjE2MzExNjk1MDIsIm5iZiI6MTYzMTE2OTUwMiwiZXhwIjoxNjYyNzA1NTAyLCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.p0YoIC_bhOxIOugYxDQTOFIK9t2ORiHQq9H6JWzdByBJKWkFDBisKaXZJvzn1HdU5cjNQnHaBfWpG1Ed15cQlB2LdpXxxc38iaaGW2J6WhlLhVkehloii-TtlZTOeqNrpAHbSe5DRrmm_L07Llm9wr1T1A6pP3MhzdHiZ9d6748j3_cJjK4CJUl3WfYRTaozLFlI00OCW4zzGfgivSighjSFyhqMoHnQ2iSoeWdcJnYpXzXQdc5AXvXOt6eIIa7o2F6Ma1tUseTYVijEVfngdfd21JI1eH6tHrSqUItkQHAart9o74dJn9micI3WrN5yEBXgzemqWkQGV4QzFHLyd3wk-XvP1s2GhCeWlJZOQADzgzhLoxzFUbgM5xULWHp3yfpePGISlM4ZpBwTHcqQt1i_UkNX_zCxa3RYQbZFDfWW0-UPbvHw40t5BY6X7nTPMhPjPGnnPq18jyYBrWBbC9vBWs2o2IHAe5VlkHtmy_v5fymFJLfFzS784Nxp2qPJFWxI7IfrpNckHxohhs5LoieQivw2MyU2shFOUjgwe0xQgyg6UBg5PwNknGTTmzYdavCM4BiQ7moqOuoI15ccIEmc_uMiuLVEfDPlzejP9PQv6mj6IlkJ8HSu4KZU-LxKmtLnGeEwMjVAZBIhsOwzMkaMF1nZ70pgv2YYwBQyVVs` + }, + }) + .then(res => { + if (res.data.code == 200) { + if (res.data.status) { + this.getHotActivity(); + } else { + wx.showModal({ + content: res.data.message || '请下拉页面刷新重试', + showCancel: false + }); + } + } else { + wx.showModal({ + content: res.data.message || '请下拉页面刷新重试', + showCancel: false + }); + } + wx.hideLoading(); + }) + .catch(() => { + wx.hideLoading(); + wx.showModal({ + content: '请求失败', + showCancel: false + }); + }); + }, getMyAttention() { let tab_item = this.tab_list[this.tab_current]; this.$http @@ -131,7 +172,7 @@ console.log('发现列表',tab_item.list) } else { wx.showModal({ - content: res.message || '请下拉页面刷新重试', + content: res.data.message || '请下拉页面刷新重试', showCancel: false }); } @@ -207,7 +248,8 @@ page: tab_item.page, page_size: this.pageSize, data:{ - order: discover_type + order: discover_type, + user_id: 1 } }) .then(res => { diff --git a/pages/discover/discoverdetails.vue b/pages/discover/discoverdetails.vue index 878fd57..2ff90b7 100644 --- a/pages/discover/discoverdetails.vue +++ b/pages/discover/discoverdetails.vue @@ -4,53 +4,54 @@ - + V - 最新FUEJFEI + {{discover_details.user.nick_name}} - 08-28 18:39 + {{discover_details.updated_at}} - 在售商品在售商品在售商品在售商品在售商品在售商品在售商品在售 + {{discover_details.content}} - + - - - 379 + + + + {{discover_details.likes_count}} - - 3579 + + {{discover_details.view_count}} - - 63 + + {{discover_details.comments_count}} - - 共 2条评论 + + 共 {{discover_details.comments_count}}条评论 - - + + - + - 金城优选哈哈 + {{commentitem.user.nick_name}} - 评论评论评论评论评论评论评论评论评论评论评论评论评论评论评论评论评论08-30 + {{commentitem.content}}{{commentitem.created_at}} @@ -61,36 +62,19 @@ - - - - - - - 优选嘿嘿 - - 评论评论评论评论评论评论评论评论评论评论评论评论评论评论评论评论评论08-30 - - - - - - - 10 - - + - + - 金城优选哈哈 + {{commentitem.user.nick_name}} 回复 - 优选嘿嘿: - 哈哈哈哈哈 - 08-30 + {{commentitem.to_user.nick_name}}: + {{commentitem.content}} + {{commentitem.created_at}} @@ -103,46 +87,28 @@ - - - - - - - - - 金城优选哈哈 - - 评论评论评论评论评论评论评论评论评论评论评论评论评论评论评论评论评论08-30 - - - - - - - 10 - - - - + + + 暂无评论,友好的评论两句吧~ - + - - - 379 + + + + {{discover_details.likes_count}} - - 3579 + + {{discover_details.view_count}} - - 379 + + {{discover_details.comments_count}} @@ -150,6 +116,220 @@