diff --git a/src/app.wpy b/src/app.wpy index 037aace..9932905 100644 --- a/src/app.wpy +++ b/src/app.wpy @@ -168,6 +168,7 @@ subPackages: [ 'pages': [ 'information', 'otherHalfDemand', +'personalDynamic', 'qualitySingle', 'registration', 'searchCondition', diff --git a/src/components/dynamicList.wpy b/src/components/dynamicList.wpy index 46e634e..48102a1 100644 --- a/src/components/dynamicList.wpy +++ b/src/components/dynamicList.wpy @@ -404,18 +404,18 @@ scroll-view { } }, jumpPath(url, type) { - let vm = this - // 校验是否完成注册资料 - if (!vm.$signInVerify()) { - vm.$emit('signInVerify') - return + let vm = this + // 校验是否完成注册资料 + if (!vm.$signInVerify()) { + vm.$emit('signInVerify') + return + } + console.log(vm.from, url, type, '7777') + if (vm.from != 'dynamic' && type != 'vote' && vm.from != 'hotTopic') { + return + } + wx.navigateTo({url: url}) } - console.log(vm.from, url, type, '7777') - if (vm.from != 'dynamic' && type != 'vote' && vm.from != 'hotTopic') { - return - } - wx.navigateTo({url: url}) - } }, created() {} }) diff --git a/src/components/dynamicOperation.wpy b/src/components/dynamicOperation.wpy index e66898a..c18fe19 100644 --- a/src/components/dynamicOperation.wpy +++ b/src/components/dynamicOperation.wpy @@ -35,7 +35,7 @@ 删除 - 不感兴趣 + 不感兴趣 举报 取消 diff --git a/src/pages/home/information.wpy b/src/pages/home/information.wpy index 1359f8f..bbc4557 100644 --- a/src/pages/home/information.wpy +++ b/src/pages/home/information.wpy @@ -232,12 +232,26 @@ page { align-items: center; position: relative; margin-bottom: 20rpx; + .ui-rit{ + width:10rpx; + height:20rpx; + display: block; + margin-right: 10rpx; + } .icon{ width: 28rpx; height: 28rpx; margin-right: 8rpx; } } + .ui-dynamic-pic-box{ + width: 25%; + .ui-dynamic-pic{ + width: 144rpx; + height: 144rpx; + border-radius: 20rpx; + } + } .hintMsg { background: #FDFAF1; padding: 12rpx 22rpx 12rpx 72rpx; @@ -578,6 +592,21 @@ page { + + + + + + 个人动态 + + + + + + + + + @@ -784,6 +813,8 @@ wepy.page({ {name: '真人未认证', activeName: '真人已认证', activeIcon: 'https://image.fulllinkai.com/202407/30/8f2700a35614c24f578ac6b5bf6e74c6.png', active: false, icon: 'https://image.fulllinkai.com/202202/23/c8a7f144e6eb593a5c494e700a212dac.png'}, {name: '学历未认证', activeName: '学历已认证', activeIcon: 'https://image.fulllinkai.com/202407/30/8f2700a35614c24f578ac6b5bf6e74c6.png', active: false, icon: 'https://image.fulllinkai.com/202202/23/c6e970db876230df0411eddd49d9e58f.png'} ], + dynamicPhotos: [], // 个人动态图片 + dynamicTotal: 0, praiseList: [], praisePage: 1, selectPraise: [], @@ -825,6 +856,24 @@ wepy.page({ wx.hideLoading() }) }, + // 用户个人动态 + getDynamic () { + let vm = this + vm.$get({url: `${service.host}/moment/list/other/user/${vm.id}`}).then(({code, data}) => { + if (code == 0) { + vm.dynamicTotal = data.total_pages + data.data.forEach((item) => { + item.dynamicPhotos = JSON.parse(item.photos) + if (item.dynamicPhotos && item.dynamicPhotos.length > 0 && vm.dynamicPhotos.length < 4) { + vm.dynamicPhotos.push(item.dynamicPhotos[0]) + } + }) + } + wx.hideLoading() + }).catch(() => { + wx.hideLoading() + }) + }, // 夸夸TA换一批 refresh() { let vm = this @@ -1247,7 +1296,9 @@ wepy.page({ vm.loginShow = true return } - if (type == 'chitchat') { + if (type == 'dynamic') { + wx.navigateTo({url: `/pages/home/personalDynamic?id=${vm.id}`}) + } else if (type == 'chitchat') { wx.navigateTo({url: `/pages/news/chitchat?id=${vm.id}&name=${encodeURIComponent(vm.userInfo.base_profile.nickname)}&pic=${vm.userInfo.base_profile.photo}&type=${vm.userInfo.base_profile.type}&real=${vm.userInfo.approve_profile.is_real_approved}`}) } else if (type == 'vip' && !vm.isIos) { wx.navigateTo({url: `/pages/users/upgradeVIP`}) @@ -1305,6 +1356,7 @@ wepy.page({ vm.userType = wx.getStorageSync('type') vm.id = e.id vm.getDetail() + vm.getDynamic() vm.getPraiseList() vm.getUserPraise() vm.showNextBullet() diff --git a/src/pages/home/personalDynamic.wpy b/src/pages/home/personalDynamic.wpy new file mode 100644 index 0000000..d0c4a5c --- /dev/null +++ b/src/pages/home/personalDynamic.wpy @@ -0,0 +1,607 @@ + + + + + +{ +navigationBarTitleText: '个人动态', +enablePullDownRefresh: true, +navigationStyle: 'custom', +backgroundColorTop: '#ffffff', +backgroundColorBottom: '#ffffff', +usingComponents: { +dynamicOperation: '~@/components/dynamicOperation', +pageScroll: '~@/components/pageScroll' +} +} + diff --git a/src/pages/news/groupChitchat.wpy b/src/pages/news/groupChitchat.wpy index a4e76f7..246b757 100644 --- a/src/pages/news/groupChitchat.wpy +++ b/src/pages/news/groupChitchat.wpy @@ -549,7 +549,7 @@ page { {{item.time}} - + {{item.name}} @@ -1467,6 +1467,9 @@ wepy.page({ jumpDetailPath() { let vm = this wx.navigateTo({url: `/pages/news/groupChitchatDetail?id=${vm.otherUserId}`}) + }, + jumpPath(e) { + wx.navigateTo({url: `/pages/home/information?id=${e.userId}`}) } },