diff --git a/src/app.wpy b/src/app.wpy
index 5c3115b..5773710 100644
--- a/src/app.wpy
+++ b/src/app.wpy
@@ -182,6 +182,7 @@ subPackages: [
'friendRequest',
'groupChitchat',
'groupChitchatDetail',
+'newsSearch',
'review',
'systemNews',
'visitor',
diff --git a/src/pages/home/information.wpy b/src/pages/home/information.wpy
index 9eb9075..bb99111 100644
--- a/src/pages/home/information.wpy
+++ b/src/pages/home/information.wpy
@@ -537,7 +537,7 @@ page {
-
+
{{userInfo.base_profile.fans_count}} 粉丝
@@ -596,6 +596,19 @@ page {
{{ userInfo.other_profile.interest_hobby || 'ta什么也没有留下' }}
+
+
+
+
+ 兴趣标签
+
+
+
+ {{ item }}
+
+
+ {{ userInfo.other_profile.interest_hobby || 'ta什么也没有留下' }}
+
@@ -1027,7 +1040,7 @@ wepy.page({
return
}
vm.$showLoading('')
- vm.$post({url: `${service.host}/follow/users/119488`}).then(({code, data}) => {
+ vm.$post({url: `${service.host}/follow/users/${vm.id}`}).then(({code, data}) => {
if (code == 0) {
if (data.is_followed) {
vm.$showToast(`已关注`)
@@ -1233,7 +1246,7 @@ wepy.page({
return
}
if (type == 'chitchat') {
- wx.navigateTo({url: `/pages/news/groupChitchat?id=${vm.userInfo.id}&name=${encodeURIComponent(vm.userInfo.nickname)}&pic=${vm.userInfo.photo}&type=${vm.userInfo.type}`})
+ 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`})
}
diff --git a/src/pages/news/chitchat.wpy b/src/pages/news/chitchat.wpy
index 0760d23..a5bec79 100644
--- a/src/pages/news/chitchat.wpy
+++ b/src/pages/news/chitchat.wpy
@@ -708,6 +708,7 @@ wepy.page({
otherUserId: '',
otherUserType: '',
otherUserName: '',
+ otherUserReal: 0, // 对方是否真人认证
chatInfoData: {},
reportShow: false, // 举报
@@ -1532,6 +1533,7 @@ wepy.page({
vm.otherAvatar = e.pic
vm.otherUserId = e.id
vm.otherUserType = e.type
+ vm.otherUserReal = e.real
vm.otherUserName = decodeURIComponent(e.name)
// 获取表情包数据
vm.emojiList = vm.emojiCts()
diff --git a/src/pages/news/friendRequest.wpy b/src/pages/news/friendRequest.wpy
index bbd449a..8feb51d 100644
--- a/src/pages/news/friendRequest.wpy
+++ b/src/pages/news/friendRequest.wpy
@@ -494,6 +494,7 @@ wepy.page({
msg: '',
sex: '',
id: '',
+ real: 0,
userId: '',
userType: '',
approveTips: false,
@@ -602,7 +603,7 @@ wepy.page({
if (code == 0) {
if (e) {
vm.$showToast('已添加为好友')
- let url = `/pages/news/chitchat?id=${vm.userId}&name=${encodeURIComponent(vm.name)}&type=${vm.userType}&icon=${vm.pic}`
+ let url = `/pages/news/chitchat?id=${vm.userId}&name=${encodeURIComponent(vm.name)}&type=${vm.userType}&pic=${vm.pic}&real=${vm.real}`
wx.redirectTo({url: url})
} else {
vm.$showToast('已拒绝')
@@ -674,6 +675,7 @@ wepy.page({
// 好友申请获取申请用户数据
vm.msg = e.message
vm.id = e.id
+ vm.real = e.user.is_real_approved
vm.name = e.user.nickname
vm.sex = e.user.sex
vm.userId = e.user.id
diff --git a/src/pages/news/newsSearch.wpy b/src/pages/news/newsSearch.wpy
index f720a76..3f28e96 100644
--- a/src/pages/news/newsSearch.wpy
+++ b/src/pages/news/newsSearch.wpy
@@ -4,9 +4,162 @@ page {
background-color: #ffffff;
}
+.m_search {
+ width: 446rpx;
+ height: 64rpx;
+ background-color: #f8f8f8;
+ border-radius: 100rpx;
+ padding: 0 22rpx;
+ margin-left: 30rpx;
+
+ .m_search_icon {
+ width: 28rpx;
+ height: 28rpx;
+ margin-right: 8rpx;
+ }
+
+ .ui-close-search-icon{
+ width: 26rpx;
+ height: 26rpx;
+ position: absolute;
+ right: 30rpx;
+ top: 20rpx;
+ }
+}
+
+.ui-container{
+ .ui-no-data-box {
+ text-align: center;
+ .ui-no-data-icon {
+ width: 440rpx;
+ height: 300rpx;
+ margin: 200rpx auto -40rpx auto;
+ }
+ }
+
+ .ui-touch-item {
+ display: flex;
+ justify-content: space-between;
+ width: 100%;
+ overflow: hidden;
+ padding: 24rpx 0 24rpx 30rpx;
+ }
+
+ .ui-content {
+ width: 100%;
+ margin-right: 0;
+ -webkit-transition: all 0.4s;
+ transition: all 0.4s;
+ -webkit-transform: translateX(90px);
+ transform: translateX(90px);
+ margin-left: -90px;
+ overflow: hidden;
+ position: relative;
+
+ .ui-messageBox {
+ margin-top: 2rpx;
+ margin-left: 16rpx;
+
+ .ui-is-top{
+ margin-left: 16rpx;
+ padding-left: 8rpx;
+ width: 76rpx;
+ height: 32rpx;
+ background: linear-gradient(90deg, #FFD18D 0%, #FFA564 100%);
+ border-radius: 8rpx;
+ line-height: 32rpx;
+ }
+
+ .ui-name {
+ width: 400rpx;
+ }
+
+ .ui-message {
+ width: 524rpx;
+ }
+ }
+
+ .ui-unreadBox {
+ position: absolute;
+ right: 30rpx;
+ top: 0;
+ overflow: hidden;
+
+ .ui-lastTime {
+ margin-top: 10rpx;
+ }
+
+ .ui-no-disturbing {
+ width: 32rpx;
+ height: 32rpx;
+ margin-top: 12rpx;
+ }
+
+ .ui-unreadNum, .ui-unreadNum_1 {
+ float: right;
+ width: 28rpx;
+ height: 28rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 50%;
+ font-size: 20rpx;
+ background: #f1013D;
+ color: #fff;
+ margin-top: 12rpx;
+ }
+
+ .ui-unreadNum_1 {
+ width: 44rpx;
+ border-radius: 14rpx;
+ }
+ }
+ }
+}
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无搜索结果
+
+
+
+
+
+
+
+ {{item.title}}
+ 已置顶
+
+
+ [有人@你]
+ {{item.content}}
+
+
+
+ {{item.last_time}}
+
+
+
+
+
+
+
+
+