dengzhifeng/ufutx_love_mp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zengBin 2024-09-29 18:18:30 +08:00
parent 9047f40c97
commit 02fa61d94b
4 changed files with 85 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/pages/news/friendRequest.wpy
View File

@ -368,7 +368,7 @@ page {
<view class="ui-list-items" v-for="(item, index) in list" :key="index">
<view class="ui-item-data" @tap="jumpPath(item)">
<view class="weuis" @tap.stop="jumpDetailPath(item)">
<view class="dist dot" v-if="item.status == 0"></view>
<view class="dist dot" v-if="item.status == 0 && tabBarIndex == 0"></view>
<image :src="item.user.photo" mode="aspectFill" class="bc_acatar"></image>
</view>
<view class="rit weuis">
@ -376,10 +376,10 @@ page {
<view class="font_32 color333 bold name">
{{item.user.nickname }}
</view>
<block v-if="item.user.type !== 'single'">
<image class="referencesIcon" src="https://image.fulllinkai.com/202207/15/7e78a1dd367f1250d4cba4e85bfd60f1.png" mode="widthFix"></image>
</block>
<view class="font_24 time">{{ item.create_time }}</view>
<!-- <block v-if="item.user.type !== 'single'">-->
<!-- <image class="referencesIcon" src="https://image.fulllinkai.com/202207/15/7e78a1dd367f1250d4cba4e85bfd60f1.png" mode="widthFix"></image>-->
<!-- </block>-->
<view class="font_24 time">{{ item.update_time }}</view>
<block v-if="item.user.type == 'single'">
<image v-if="item.user.rank_id == 0" class="Vip flo_l bg-img" src="https://images.ufutx.com/202102/04/bfad7e2a8e86cf7912ff280234a35606.png"></image>
<image v-else class="Vip flo_l bg-img" src="https://images.ufutx.com/202102/04/d0913df8b234057229ab3dd102497a50.png"></image>
@ -387,7 +387,7 @@ page {
<image v-if="item.user.sex == 1" class="img" src="https://images.ufutx.com/202101/27/1fc8381ccac933612936bb617a5ae906.png" alt=""/>
<image v-else class="img" src="https://images.ufutx.com/202101/27/f17913a8fc57de75dc0046db6c317b35.png" alt=""/>
<view v-if="item.user.age == null">0</view>
<view v-else>{{ item.user.age }}</view>
<view v-else>{{ item.profile.age }}</view>
</view>
</block>
</view>
@ -528,7 +528,8 @@ wepy.page({
vm.$get({url: url, data}).then(({code, data}) => {
if (code === 0) {
data.data.forEach((item) => {
item.create_time = item.create_time.split(' ', 1)
item.update_time = item.update_time.split(' ', 1)
item.refuse_tag = item.refuse_tag ? JSON.parse(item.refuse_tag) : []
})
if (vm.list.length === 0 || vm.page === 1) {
vm.list = data.data
@ -540,21 +541,21 @@ wepy.page({
if (vm.list.length < 15 || data.data.length < 15) {
vm.no_more = true
}
let obj = {}
let peon = []
// 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
// 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)

120
src/pages/tabBar/home.wpy
View File

@ -303,71 +303,73 @@ page {
<view class="ui-prefecture-mask font_28 colorF bold f-fcc">{{item.title}}</view>
</view>
</view>
<view class="f-fbc ui-referrals-box">
<view class="font_34 color333 bold">为你推荐</view>
<image class="ui-require-icon" src="https://image.fulllinkai.com/202409/24/4f52d791e75a7e89a5696754f37e51f7.png" mode="widthFix" @tap="jumpPath('/pages/users/selfTextarea?text=期望对方&placeText=写下你心中理想的对象')"></image>
</view>
<view class="box_swiper">
<swiper class="card-swiper" bindchange="cardSwiper" :current="cardCur" previousMargin="-2px" nextMargin="10px">
<swiper-item v-for="(item,index) in referrals" :key="index" class="{{cardCur==index?'cur':'noneBor'}} {{cardCur==index+1?'lastPic':''}} {{cardCur==index-1?'nextPic':''}} {{cardCur == 0 ? 'ui-swiper-item' : ''}}">
<block v-if="item.type && item.type == 'time'">
<view class="swiper-item radius shadow">
<view class="t_title color999 font_26">福恋会在每天 12 点为你推荐 7 个用户</view>
<view class="text-center ui-mt-26">
<view class="t_dot"></view>
<view class="font_28 color666">下次推荐时间</view>
<block v-if="referrals && referrals.length > 0">
<view class="f-fbc ui-referrals-box">
<view class="font_34 color333 bold">为你推荐</view>
<image class="ui-require-icon" src="https://image.fulllinkai.com/202409/24/4f52d791e75a7e89a5696754f37e51f7.png" mode="widthFix" @tap="jumpPath('/pages/users/selfTextarea?text=期望对方&placeText=写下你心中理想的对象')"></image>
</view>
<view class="box_swiper">
<swiper class="card-swiper" bindchange="cardSwiper" :current="cardCur" previousMargin="-2px" nextMargin="10px">
<swiper-item v-for="(item,index) in referrals" :key="index" class="{{cardCur==index?'cur':'noneBor'}} {{cardCur==index+1?'lastPic':''}} {{cardCur==index-1?'nextPic':''}} {{cardCur == 0 ? 'ui-swiper-item' : ''}}">
<block v-if="item.type && item.type == 'time'">
<view class="swiper-item radius shadow">
<view class="t_title color999 font_26">福恋会在每天 12 点为你推荐 7 个用户</view>
<view class="text-center ui-mt-26">
<view class="t_dot"></view>
<view class="font_28 color666">下次推荐时间</view>
</view>
<view class="text-center bold font_52 ui-mt-24" style="letter-spacing: 6rpx;" v-if="countdown">
{{ countdown.h}}:{{ countdown.m}}:{{ countdown.s}}
</view>
<block v-if="countdown.d == '0' && countdown.h == '00' && countdown.m == '00' && countdown.s == '00'">
<view class="t_r_btn text-center f-fcc" @tap="refreshFn">
<image src="https://image.fulllinkai.com/202206/09/c68f69b89269c604a3671b81ff1c14a5.png" class="_icon" mode="widthFix"></image>
手动更新每日推荐
</view>
</block>
<block v-else>
<view class="t_r_btn text-center f-fcc" @tap="goBackFirst">
<image src="https://image.fulllinkai.com/202206/09/c68f69b89269c604a3671b81ff1c14a5.png" class="_icon" mode="widthFix"></image>
回看今日推荐
</view>
</block>
<view class="t_bg"></view>
<view class="t_btn text-center" @tap="goto_2('/pages/users/qualitySingle','other')">点击查看更多优质单身</view>
</view>
<view class="text-center bold font_52 ui-mt-24" style="letter-spacing: 6rpx;" v-if="countdown">
{{ countdown.h}}:{{ countdown.m}}:{{ countdown.s}}
</block>
<block v-else-if="item.type && item.type == 'activity'">
<view class="swiper-item radius shadow activityCard">
<view class="bc_img" :style="{backgroundImage:'url('+(item.photo)+');'}"></view>
</view>
<block v-if="countdown.d == '0' && countdown.h == '00' && countdown.m == '00' && countdown.s == '00'">
<view class="t_r_btn text-center f-fcc" @tap="refreshFn">
<image src="https://image.fulllinkai.com/202206/09/c68f69b89269c604a3671b81ff1c14a5.png" class="_icon" mode="widthFix"></image>
手动更新每日推荐
</block>
<block v-else>
<view class="swiper-item radius shadow" @tap="jumpPath(`/pages/home/information?id=${item.id}`)">
<view class="bc_img" :style="{backgroundImage:'url('+(item.photo)+');'}"></view>
<view class="f-fbc d_user_data ui-mt-18">
<view class="f-fbc ">
<span class="bold color333 font_32 ellipsis_1" style="max-width: 30vw;">{{ item.nickname }}{{cardCur}}</span>
<image src="https://image.fulllinkai.com/202206/10/d0913df8b234057229ab3dd102497a50.png" class="vip_icon" mode="widthFix" v-if="item.rank_id"></image>
<image src="https://image.fulllinkai.com/202206/10/bfad7e2a8e86cf7912ff280234a35606.png" class="vip_icon" mode="widthFix" v-else></image>
<image src="https://image.fulllinkai.com/202206/10/5cb84879a0dc81757dc526ebeb61bc0e.png" class="real_icon" mode="widthFix" v-if="item.is_approved == 1"></image>
<image src="https://image.fulllinkai.com/202206/10/279ade8a42810a91eb80a0717823dffa.png" class="reality_icon" mode="widthFix" v-if="item.is_real_approved == 1"></image>
</view>
<view class="address f-fbc">
<image src="https://image.fulllinkai.com/202206/07/817a393539ee854226eef79defef2fc4.png" class="address_icon" mode="aspectFit"></image>
<span class="font_24">{{ item.city }}</span>
</view>
</view>
</block>
<block v-else>
<view class="t_r_btn text-center f-fcc" @tap="goBackFirst">
<image src="https://image.fulllinkai.com/202206/09/c68f69b89269c604a3671b81ff1c14a5.png" class="_icon" mode="widthFix"></image>
回看今日推荐
<view class="f-fbc d_user_data ui-mt-8">
<span class="color333 font_28 ellipsis_1">{{ item.year + ' · ' }}{{item.stature + ' · '}}{{ item.degree ? item.degree + ' · ' : '' }}{{ item.industry_sub ? item.industry_sub : '' }}</span>
</view>
</block>
<view class="t_bg"></view>
<view class="t_btn text-center" @tap="goto_2('/pages/users/qualitySingle','other')">点击查看更多优质单身</view>
</view>
</block>
<block v-else-if="item.type && item.type == 'activity'">
<view class="swiper-item radius shadow activityCard">
<view class="bc_img" :style="{backgroundImage:'url('+(item.photo)+');'}"></view>
</view>
</block>
<block v-else>
<view class="swiper-item radius shadow" @tap="jumpPath(`/pages/home/information?id=${item.id}`)">
<view class="bc_img" :style="{backgroundImage:'url('+(item.photo)+');'}"></view>
<view class="f-fbc d_user_data ui-mt-18">
<view class="f-fbc ">
<span class="bold color333 font_32 ellipsis_1" style="max-width: 30vw;">{{ item.nickname }}{{cardCur}}</span>
<image src="https://image.fulllinkai.com/202206/10/d0913df8b234057229ab3dd102497a50.png" class="vip_icon" mode="widthFix" v-if="item.rank_id"></image>
<image src="https://image.fulllinkai.com/202206/10/bfad7e2a8e86cf7912ff280234a35606.png" class="vip_icon" mode="widthFix" v-else></image>
<image src="https://image.fulllinkai.com/202206/10/5cb84879a0dc81757dc526ebeb61bc0e.png" class="real_icon" mode="widthFix" v-if="item.is_approved == 1"></image>
<image src="https://image.fulllinkai.com/202206/10/279ade8a42810a91eb80a0717823dffa.png" class="reality_icon" mode="widthFix" v-if="item.is_real_approved == 1"></image>
</view>
<view class="address f-fbc">
<image src="https://image.fulllinkai.com/202206/07/817a393539ee854226eef79defef2fc4.png" class="address_icon" mode="aspectFit"></image>
<span class="font_24">{{ item.city }}</span>
<view class="f-fbc d_user_data ui-mt-6">
<span class="color666 font_28 ellipsis_1" style="width: 80vw;">{{ item.introduction || '介绍：未填写' }}</span>
</view>
</view>
<view class="f-fbc d_user_data ui-mt-8">
<span class="color333 font_28 ellipsis_1">{{ item.year + ' · ' }}{{item.stature + ' · '}}{{ item.degree ? item.degree + ' · ' : '' }}{{ item.industry_sub ? item.industry_sub : '' }}</span>
</view>
<view class="f-fbc d_user_data ui-mt-6">
<span class="color666 font_28 ellipsis_1" style="width: 80vw;">{{ item.introduction || '介绍：未填写' }}</span>
</view>
</view>
</block>
</swiper-item>
</swiper>
</view>
</block>
</swiper-item>
</swiper>
</view>
</block>
<view class="ui-prefecture-title font_34 color333 bold" v-if="squareList && squareList.length > 0">单身广场</view>
<block v-for="(item,index) in squareList" :key="index">
<view class="box_swiper ui-pl-30 ui-pr-30 ui-mb-40">

2
src/pages/tabBar/news.wpy
View File

@ -326,7 +326,7 @@ wepy.page({
})
} else {
wx.removeTabBarBadge({
index: 0
index: 2
})
}
}

2
src/utils/im.js
View File

@ -153,7 +153,7 @@ const IM = (account, token) => {
})
} else {
wx.removeTabBarBadge({
index: 0
index: 2
})
}
}