1、招租列表的主图位移问题：足迹和食堂招租页面的存在有平台推荐和非推荐的标签显示所以会存在错位
2、发布页面的按钮触底 3、优惠券的满减券列表的布局
This commit is contained in:
parent
986eee5e7f
commit
e96d67023b
@ -29,7 +29,8 @@
|
||||
style="width: auto; position: relative;display: flex;justify-content: flex-start;align-items: center;">
|
||||
<view
|
||||
style="max-width: 110rpx; position: relative;font-size: 28rpx;font-weight: 400;color: #999999;line-height: 32rpx;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
|
||||
{{dictLabel || '标签'}}</view>
|
||||
{{dictLabel || '标签'}}
|
||||
</view>
|
||||
<image style="width: 27rpx;height: 27rpx;margin-left: 6rpx;"
|
||||
src="https://jiangxiaoxian.0rui.cn/rentMore.png" mode=""></image>
|
||||
</view>
|
||||
@ -48,13 +49,16 @@
|
||||
@refresherrefresh="onS" scroll-y="true" class="flex align-items"
|
||||
style="height: 1250rpx;box-sizing: border-box;">
|
||||
<view class="recommend-box">
|
||||
<view class="rrecommList" >
|
||||
<view class="rrecommList">
|
||||
<view class="reListItem" v-for="(item,index) in rentList" :key="index" @click="toDetail(item)">
|
||||
<!-- 左侧图片 -->
|
||||
<view class="listItem-images">
|
||||
<image v-if="item.recommend == 1"
|
||||
style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;"
|
||||
src="https://jiangxiaoxian.0rui.cn/hot.png"></image>
|
||||
<image v-if="item.recommend != 1"
|
||||
style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;"
|
||||
src=""></image>
|
||||
<image class="iamges-mainImg" :src="item.images[0]"></image>
|
||||
</view>
|
||||
<!-- 右侧内容 -->
|
||||
@ -72,14 +76,14 @@
|
||||
<view style="display: flex;">
|
||||
<image style="width: 24rpx;height: 24rpx;"
|
||||
src="https://jiangxiaoxian.0rui.cn/locationList.png"></image>
|
||||
<view class="title3" style="margin-left: 10rpx;">{{item.address_city_text}}
|
||||
<view class="title3" style="margin-left: 6rpx;">{{item.address_city_text}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="title3">{{item.release_time_text}}</view>
|
||||
<view style="display: flex;align-items: center;justify-content: center;">
|
||||
<image style="width: 26rpx;height: 20rpx;"
|
||||
src="https://jiangxiaoxian.0rui.cn/eye.png"></image>
|
||||
<view class="title3" style="margin-left: 10rpx;">{{item.views}}</view>
|
||||
<view class="title3" style="margin-left: 6rpx;">{{item.views}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -239,7 +243,7 @@
|
||||
|
||||
if (res.data && res.data.list) {
|
||||
// rentList.value = res.data.list;
|
||||
rentList.value =[...rentList.value,...res.data.list];
|
||||
rentList.value = [...rentList.value, ...res.data.list];
|
||||
rentCount.value = res.data.count;
|
||||
// Safely process each item
|
||||
rentList.value = rentList.value.map(item => {
|
||||
@ -281,7 +285,7 @@
|
||||
title: '加载中...'
|
||||
});
|
||||
resetLists();
|
||||
|
||||
|
||||
setTimeout(() => {
|
||||
homrS.value = false;
|
||||
uni.hideLoading();
|
||||
@ -294,14 +298,13 @@
|
||||
rentList.value = [];
|
||||
getList();
|
||||
}
|
||||
|
||||
function toDetail(e){
|
||||
console.log('跳转详情',e);
|
||||
|
||||
function toDetail(e) {
|
||||
console.log('跳转详情', e);
|
||||
uni.navigateTo({
|
||||
url:'/pages/canteenRent/rentDetail?id=' + e.id
|
||||
url: '/pages/canteenRent/rentDetail?id=' + e.id
|
||||
})
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@ -311,7 +314,7 @@
|
||||
background-color: #fff;
|
||||
display: grid;
|
||||
border-radius: 18rpx;
|
||||
|
||||
|
||||
.contactedBox {
|
||||
width: 660rpx;
|
||||
height: 325rpx;
|
||||
@ -321,7 +324,7 @@
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
|
||||
.contactBtn {
|
||||
width: 660rpx;
|
||||
height: 92rpx;
|
||||
@ -329,7 +332,7 @@
|
||||
display: flex;
|
||||
border-radius: 0 0 18rpx 18rpx;
|
||||
// margin-top: 40rpx;
|
||||
|
||||
|
||||
.tactBtnBox {
|
||||
width: 330rpx;
|
||||
height: 92rpx;
|
||||
@ -338,7 +341,7 @@
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
|
||||
.tactBtnBox2 {
|
||||
width: 330rpx;
|
||||
height: 92rpx;
|
||||
@ -348,9 +351,9 @@
|
||||
justify-content: center;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
.search-result {
|
||||
padding-top: 10px;
|
||||
padding-bottom: 20px;
|
||||
|
||||
@ -255,6 +255,8 @@
|
||||
}
|
||||
|
||||
onShow(() => {
|
||||
couponFullList.value = []
|
||||
couponTimesList.value = []
|
||||
getCouponFullList();
|
||||
});
|
||||
</script>
|
||||
@ -344,7 +346,8 @@
|
||||
|
||||
.couponsListFull {
|
||||
// width: 690rpx;
|
||||
display: grid;
|
||||
padding: 0 30rpx;
|
||||
// display: grid;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
min-height: 80vh;
|
||||
|
||||
@ -952,7 +952,7 @@
|
||||
|
||||
.bottomBtn {
|
||||
width: 750rpx;
|
||||
height: 200rpx;
|
||||
// height: 200rpx;
|
||||
background: #FFFFFF;
|
||||
border-radius: 0rpx 0rpx 0rpx 0rpx;
|
||||
position: fixed;
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
<view class="cons-third">
|
||||
<image style="width: 24rpx;height: 24rpx;"
|
||||
src="https://jiangxiaoxian.0rui.cn/locationList.png"></image>
|
||||
<view class="title3" style="margin-left: 10rpx;">{{item.address_city_text}}
|
||||
<view class="title3" style="margin-left: 6rpx;">{{item.address_city_text}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -409,14 +409,14 @@
|
||||
height: 190rpx;
|
||||
position: relative;
|
||||
right: 0rpx;
|
||||
bottom: 18rpx;
|
||||
bottom: 0rpx;
|
||||
z-index: 1;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.listItem-contents {
|
||||
width: 300rpx;
|
||||
width: 326rpx;
|
||||
height: auto;
|
||||
margin-left: 20rpx;
|
||||
|
||||
|
||||
@ -14,6 +14,9 @@
|
||||
<image v-if="e.information.recommend == 1"
|
||||
style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;"
|
||||
src="https://jiangxiaoxian.0rui.cn/hot.png"></image>
|
||||
<image v-if="e.information.recommend != 1"
|
||||
style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;"
|
||||
src=""></image>
|
||||
<image class="iamges-mainImg" :src="e.information.images[0]"></image>
|
||||
</view>
|
||||
<!-- 右侧内容 -->
|
||||
@ -32,7 +35,7 @@
|
||||
<view style="display: flex;">
|
||||
<image style="width: 24rpx;height: 24rpx;"
|
||||
src="https://jiangxiaoxian.0rui.cn/locationList.png"></image>
|
||||
<view class="title3" style="margin-left: 10rpx;">
|
||||
<view class="title3" style="margin-left: 6rpx;">
|
||||
{{e.information.address_city_text}}
|
||||
</view>
|
||||
</view>
|
||||
@ -40,7 +43,7 @@
|
||||
<view style="display: flex;">
|
||||
<image style="width: 26rpx;height: 20rpx;"
|
||||
src="https://jiangxiaoxian.0rui.cn/eye.png"></image>
|
||||
<view class="title3" style="margin-left: 10rpx;">{{e.information.views}}
|
||||
<view class="title3" style="margin-left: 6rpx;">{{e.information.views}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -126,26 +129,26 @@
|
||||
});
|
||||
console.log('足迹返值', res);
|
||||
if (res.code == 1) {
|
||||
if(listQuery.value.page == 1) {
|
||||
if (listQuery.value.page == 1) {
|
||||
feetHisList.value = res.data.list;
|
||||
}else {
|
||||
} else {
|
||||
if (feetHisList.value.length > 0 && res.data.list.length > 0) {
|
||||
const lastItemOfPrevPage = feetHisList.value[feetHisList.value.length - 1];
|
||||
const firstItemOfNewPage = res.data.list[0];
|
||||
|
||||
// 判断日期是否相同
|
||||
if (isSameDate(lastItemOfPrevPage.date, firstItemOfNewPage.date)) {
|
||||
// 合并相同日期的数据
|
||||
lastItemOfPrevPage.log = [...lastItemOfPrevPage.log, ...firstItemOfNewPage.log];
|
||||
// 添加剩余的数据
|
||||
feetHisList.value = [...feetHisList.value, ...res.data.list.slice(1)];
|
||||
} else {
|
||||
// 日期不同，直接拼接
|
||||
feetHisList.value = [...feetHisList.value, ...res.data.list];
|
||||
}
|
||||
} else {
|
||||
feetHisList.value = [...feetHisList.value, ...res.data.list];
|
||||
}
|
||||
const lastItemOfPrevPage = feetHisList.value[feetHisList.value.length - 1];
|
||||
const firstItemOfNewPage = res.data.list[0];
|
||||
|
||||
// 判断日期是否相同
|
||||
if (isSameDate(lastItemOfPrevPage.date, firstItemOfNewPage.date)) {
|
||||
// 合并相同日期的数据
|
||||
lastItemOfPrevPage.log = [...lastItemOfPrevPage.log, ...firstItemOfNewPage.log];
|
||||
// 添加剩余的数据
|
||||
feetHisList.value = [...feetHisList.value, ...res.data.list.slice(1)];
|
||||
} else {
|
||||
// 日期不同，直接拼接
|
||||
feetHisList.value = [...feetHisList.value, ...res.data.list];
|
||||
}
|
||||
} else {
|
||||
feetHisList.value = [...feetHisList.value, ...res.data.list];
|
||||
}
|
||||
}
|
||||
// feetHisList.value = [...feetHisList.value, ...res.data.list]
|
||||
feetCount.value = res.data.count
|
||||
@ -153,10 +156,10 @@
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
// 辅助函数：比较两个日期是否相同
|
||||
function isSameDate(date1, date2) {
|
||||
return date1 === date2;
|
||||
return date1 === date2;
|
||||
}
|
||||
|
||||
//加载更多
|
||||
@ -188,11 +191,11 @@
|
||||
loadStatus.value = "loading";
|
||||
getFeetList();
|
||||
}
|
||||
|
||||
function toDetail(e){
|
||||
console.log('跳转详情',e);
|
||||
|
||||
function toDetail(e) {
|
||||
console.log('跳转详情', e);
|
||||
uni.navigateTo({
|
||||
url:'/pages/canteenRent/rentDetail?id=' + e.id
|
||||
url: '/pages/canteenRent/rentDetail?id=' + e.id
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user