diff --git a/src/pages/home/information.wpy b/src/pages/home/information.wpy
index bb99111..4485b55 100644
--- a/src/pages/home/information.wpy
+++ b/src/pages/home/information.wpy
@@ -589,15 +589,10 @@ page {
兴趣爱好
-
-
- {{ item }}
-
-
{{ userInfo.other_profile.interest_hobby || 'ta什么也没有留下' }}
-
+
兴趣标签
@@ -607,7 +602,6 @@ page {
{{ item }}
- {{ userInfo.other_profile.interest_hobby || 'ta什么也没有留下' }}
@@ -615,7 +609,7 @@ page {
期望对方
-
+
{{ item }}
@@ -625,7 +619,7 @@ page {
-
+
想要隐身访问Ta？
@@ -633,7 +627,7 @@ page {
开启隐身访问
-
+
@@ -651,7 +645,7 @@ page {
-
+
@@ -688,7 +682,7 @@ page {
-
+
@@ -730,7 +724,7 @@ page {
购买会员服务后可使用此功能，请及时购买
-
+
@@ -789,7 +783,6 @@ wepy.page({
praisePage: 1,
selectPraise: [],
interestLabel: [],
- showCondition: false,
conditionArr: [],
myData: {},
isIos: false,
@@ -963,9 +956,6 @@ wepy.page({
})
}
}
- if (vm.conditionArr && vm.conditionArr.length > 0) {
- vm.showCondition = true
- }
if (data.profile_photos && data.profile_photos.length == 0) {
data.profile_photos.push(data.base_profile.photo)
@@ -1040,7 +1030,7 @@ wepy.page({
return
}
vm.$showLoading('')
- vm.$post({url: `${service.host}/follow/users/${vm.id}`}).then(({code, data}) => {
+ vm.$post({url: `${service.host}/follow/user/${vm.id}`}).then(({code, data}) => {
if (code == 0) {
if (data.is_followed) {
vm.$showToast(`已关注`)
@@ -1162,9 +1152,14 @@ wepy.page({
vm.loginShow = true
return
}
+ if (!vm.userData.is_rank) {
+ vm.modalName = 'purchase'
+ return
+ }
vm.$post({url: `${service.host}/other/user/${vm.id}/hidden`}).then(({code, data}) => {
if (code == 0) {
vm.$showToast(`已开启隐身访问`)
+ vm.userInfo.other_info.hidden = true
}
wx.hideLoading()
}).catch(() => {
diff --git a/src/pages/news/friendRequest.wpy b/src/pages/news/friendRequest.wpy
index 8697699..158c3b6 100644
--- a/src/pages/news/friendRequest.wpy
+++ b/src/pages/news/friendRequest.wpy
@@ -463,7 +463,7 @@ page {
{{ rejectDisabled ? '我知道了' : '确认' }}
-
+
@@ -541,21 +541,6 @@ wepy.page({
if (vm.list.length < 15 || data.data.length < 15) {
vm.no_more = true
}
- // let obj = {}
- // let peon = []
- // 去除重复数据保留最后一条
- // if (vm.tabBarIndex == 0) {
- // peon = vm.list.reduce((cur, next) => {
- // obj[next.user_linking_id] ? '' : obj[next.user_linking_id] = true && cur.push(next)
- // return cur
- // }, [])
- // } else {
- // peon = vm.list.reduce((cur, next) => {
- // obj[next.user_id] ? '' : obj[next.user_id] = true && cur.push(next)
- // return cur
- // }, [])
- // }
- // vm.list = peon
setTimeout(() => {
vm.loading = true
}, 500)
@@ -574,7 +559,7 @@ wepy.page({
let data = {}
// 已经处理过的就关闭弹框
if (vm.rejectDisabled) {
- vm.rejectShow = false
+ vm.initReject()
return
}
if (e) {
@@ -641,6 +626,21 @@ wepy.page({
vm.page = 1
vm.getList()
},
+ initReject() {
+ let vm = this
+ vm.rejectShow = false
+ setTimeout(() => {
+ vm.rejectText = ''
+ vm.rejectDisabled = false
+ vm.rejectList = [
+ {label: '年龄不合适', labelSel: false},
+ {label: '身高不合适', labelSel: false},
+ {label: '地域不合适', labelSel: false},
+ {label: '信仰不合适', labelSel: false},
+ {label: '学历不合适', labelSel: false}
+ ]
+ }, 200)
+ },
jumpPath(e) {
let vm = this
let url = ``
diff --git a/src/pages/news/review.wpy b/src/pages/news/review.wpy
index 2aabbba..150c193 100644
--- a/src/pages/news/review.wpy
+++ b/src/pages/news/review.wpy
@@ -238,10 +238,10 @@ page {
-
+
-
+
{{item.nickname}}
diff --git a/src/pages/tabBar/news.wpy b/src/pages/tabBar/news.wpy
index 13ab329..ed6cf8f 100644
--- a/src/pages/tabBar/news.wpy
+++ b/src/pages/tabBar/news.wpy
@@ -260,9 +260,9 @@ wepy.page({
data.data.forEach((item) => {
item.isTouchMove = false
})
- if (vm.list.length === 0 || vm.page === 1) {
+ if (vm.list.length == 0 || vm.page == 1) {
vm.list = data.data
- } else if (vm.cachePage != vm.page) {
+ } else {
data.data.map(function (item) {
vm.list.push(item)
})
@@ -288,9 +288,9 @@ wepy.page({
}
}
}
+ vm.cachePage = vm.page
setTimeout(() => {
vm.loading = true
- vm.cachePage = vm.page
}, 500)
wx.hideLoading()
}).catch(err => {
@@ -475,7 +475,9 @@ wepy.page({
onShow() {
let vm = this
vm.getNewCount()
- vm.getList()
+ if (vm.cachePage != vm.page) {
+ vm.getList()
+ }
},
onLoad() {}
})