fix: 计划查看-头部空白高度修复
This commit is contained in:
@@ -1,12 +1,5 @@
|
|||||||
import request from "@/utils/request"
|
import request from "@/utils/request"
|
||||||
|
// 获取用户信息
|
||||||
export function getPersonalPlanList(params) {
|
|
||||||
return request.post({
|
|
||||||
url: '/getPersonalPlanList',
|
|
||||||
params
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getUserInfo(data) {
|
export function getUserInfo(data) {
|
||||||
return request.get({
|
return request.get({
|
||||||
url: '/crm/app/user/getUserInfo',
|
url: '/crm/app/user/getUserInfo',
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<!-- #endif -->
|
<!-- #endif -->
|
||||||
|
|
||||||
<!-- 高度来避免头部遮挡 -->
|
<!-- 高度来避免头部遮挡 -->
|
||||||
<view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
|
<view class="top-height"></view>
|
||||||
|
|
||||||
<view class="white-bg">
|
<view class="white-bg">
|
||||||
<navigator url="/pages/business/CRM/plan/myPlan">
|
<navigator url="/pages/business/CRM/plan/myPlan">
|
||||||
|
|||||||
@@ -28,9 +28,9 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="nav-list">
|
<view class="nav-list">
|
||||||
<view class="nav-item" :class="{active:index==activeTab}"
|
<view class="nav-item" :class="{active:index==activeTab}"
|
||||||
v-for="(item,index) in allPlans" :key="index"
|
v-for="(item,index) in allPlans" :key="index"
|
||||||
@click="handleNav(index)"
|
@click="handleNav(index)"
|
||||||
>{{ getTapLabel(item) }}
|
>{{ getTapLabel(item) }}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -54,7 +54,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class='bottom-spliter bg-gray'></view>
|
<view class='bottom-spliter bg-gray'></view>
|
||||||
</block>
|
</block>
|
||||||
|
|
||||||
<!-- 底部加高度来避免tabbar遮挡 -->
|
<!-- 底部加高度来避免tabbar遮挡 -->
|
||||||
@@ -269,13 +269,13 @@ function handleEdit(index) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.white-bg.white-bg-2 {
|
.white-bg.white-bg-2 {
|
||||||
/* margin-bottom: 20rpx; */
|
/* margin-bottom: 20rpx; */
|
||||||
}
|
}
|
||||||
.bottom-spliter{
|
.bottom-spliter{
|
||||||
height: 20rpx;
|
height: 20rpx;
|
||||||
}
|
}
|
||||||
.bg-gray{
|
.bg-gray{
|
||||||
background-color: #f0f0f0;
|
background-color: #f0f0f0;
|
||||||
}
|
}
|
||||||
.report-list .w-b-title .btn-edit {
|
.report-list .w-b-title .btn-edit {
|
||||||
background-color: #5C96F7;
|
background-color: #5C96F7;
|
||||||
@@ -286,14 +286,14 @@ function handleEdit(index) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.nav-list {
|
.nav-list {
|
||||||
/* display: flex;*/
|
/* display: flex;*/
|
||||||
/* width: 690rpx;*/
|
/* width: 690rpx;*/
|
||||||
overflow-x: auto; /* 允许横向滚动 */
|
overflow-x: auto; /* 允许横向滚动 */
|
||||||
/*overflow-y: hidden; 隐藏垂直滚动 */
|
/*overflow-y: hidden; 隐藏垂直滚动 */
|
||||||
/*-ms-overflow-style: none; IE 隐藏滚动条 */
|
/*-ms-overflow-style: none; IE 隐藏滚动条 */
|
||||||
/* scrollbar-width: none; */ /*Firefox 隐藏滚动条 */
|
/* scrollbar-width: none; */ /*Firefox 隐藏滚动条 */
|
||||||
/* 添加高度以确保有足够的空间 */
|
/* 添加高度以确保有足够的空间 */
|
||||||
/* height: 80rpx;*/
|
/* height: 80rpx;*/
|
||||||
white-space: nowrap; /* 保持子元素在同一行显示 */
|
white-space: nowrap; /* 保持子元素在同一行显示 */
|
||||||
/* 添加这些属性确保滚动正常工作 */
|
/* 添加这些属性确保滚动正常工作 */
|
||||||
scroll-behavior: smooth;
|
scroll-behavior: smooth;
|
||||||
@@ -310,7 +310,7 @@ function handleEdit(index) {
|
|||||||
}
|
}
|
||||||
.nav-list .nav-item {
|
.nav-list .nav-item {
|
||||||
/* flex: 0 0 auto; 关键:不放大、不缩小、自动宽度 */
|
/* flex: 0 0 auto; 关键:不放大、不缩小、自动宽度 */
|
||||||
/* width: 200rpx;*/
|
/* width: 200rpx;*/
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
background-color: #05A3F4;
|
background-color: #05A3F4;
|
||||||
border-radius: 10rpx;
|
border-radius: 10rpx;
|
||||||
|
|||||||
@@ -11,8 +11,7 @@
|
|||||||
</customHeader>
|
</customHeader>
|
||||||
|
|
||||||
<!-- 高度来避免头部遮挡 -->
|
<!-- 高度来避免头部遮挡 -->
|
||||||
<view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
|
<view class="top-height"></view>
|
||||||
|
|
||||||
<!-- 正文内容 -->
|
<!-- 正文内容 -->
|
||||||
<view>
|
<view>
|
||||||
|
|
||||||
@@ -37,61 +36,61 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 分页部分 -->
|
<!-- 分页部分 -->
|
||||||
<!-- <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"-->
|
<!-- <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"-->
|
||||||
<!-- :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"-->
|
<!-- :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"-->
|
||||||
<!-- class="scroll-h" :class="{'loading-scroll':cssFlag}">-->
|
<!-- class="scroll-h" :class="{'loading-scroll':cssFlag}">-->
|
||||||
<view class="white-bg" v-if="list.length">
|
<view class="white-bg" v-if="list.length">
|
||||||
<!--v-for="(item, index) in list" :key="index" @click="handleDetail(item)"-->
|
<!--v-for="(item, index) in list" :key="index" @click="handleDetail(item)"-->
|
||||||
<view style="text-align: center; margin-bottom: 30rpx; font-size: 30rpx;">
|
<view style="text-align: center; margin-bottom: 30rpx; font-size: 30rpx;">
|
||||||
{{ parseInt(searchValue.selectDate.substring(5, 7)) }}月
|
{{ parseInt(searchValue.selectDate.substring(5, 7)) }}月
|
||||||
<span class="line"></span>
|
<span class="line"></span>
|
||||||
{{searchValue.selectDate.substring(0, 4) }}年
|
{{searchValue.selectDate.substring(0, 4) }}年
|
||||||
</view>
|
</view>
|
||||||
|
<uni-row class="demo-uni-row">
|
||||||
|
<uni-col :span="1">
|
||||||
|
<view class="demo-uni-col right-radius">序号</view>
|
||||||
|
</uni-col>
|
||||||
|
<uni-col :span="2">
|
||||||
|
<view class="demo-uni-col left-radius">姓名</view>
|
||||||
|
</uni-col>
|
||||||
|
<block v-for="(field, i) in OrdinalDate">
|
||||||
|
<uni-col :span="3">
|
||||||
|
<view class="demo-uni-col mar-left">
|
||||||
|
<text>{{ WeekShortCN[i] }}</text>
|
||||||
|
<text v-if="list[0][field]">{{ list[0][field].substring(8) }}</text>
|
||||||
|
</view>
|
||||||
|
</uni-col>
|
||||||
|
</block>
|
||||||
|
</uni-row>
|
||||||
|
<block v-for="(item, index) in list" :key="index">
|
||||||
<uni-row class="demo-uni-row">
|
<uni-row class="demo-uni-row">
|
||||||
<uni-col :span="1">
|
<uni-col :span="1">
|
||||||
<view class="demo-uni-col right-radius">序号</view>
|
<view class="demo-uni-col right-radius">
|
||||||
|
<text>{{ index + 1 }}</text>
|
||||||
|
</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<uni-col :span="2">
|
<uni-col :span="2">
|
||||||
<view class="demo-uni-col left-radius">姓名</view>
|
<view class="demo-uni-col left-radius">
|
||||||
|
<text>{{ item.nickName || item.userName }}</text>
|
||||||
|
</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
<block v-for="(field, i) in OrdinalDate">
|
<block v-for="(field, i) in WorkType">
|
||||||
<uni-col :span="3">
|
<uni-col :span="3">
|
||||||
<view class="demo-uni-col mar-left">
|
<view class="demo-uni-col mar-left color-white" @click="handleDetail(index, i)"
|
||||||
<text>{{ WeekShortCN[i] }}</text>
|
:style="{ backgroundColor: COLOR_MAP[item[field]] }"
|
||||||
<text v-if="list[0][field]">{{ list[0][field].substring(8) }}</text>
|
><!--@click="handleView(index, i)"-->
|
||||||
|
<text v-if="item[field]">{{ item[field] }}</text>
|
||||||
|
<text v-else style="color: gray">暂无</text>
|
||||||
</view>
|
</view>
|
||||||
</uni-col>
|
</uni-col>
|
||||||
</block>
|
</block>
|
||||||
</uni-row>
|
</uni-row>
|
||||||
<block v-for="(item, index) in list" :key="index">
|
</block>
|
||||||
<uni-row class="demo-uni-row">
|
</view>
|
||||||
<uni-col :span="1">
|
<view v-else style="text-align: center; margin-top: 50%; color: white">
|
||||||
<view class="demo-uni-col right-radius">
|
暂无数据
|
||||||
<text>{{ index + 1 }}</text>
|
</view>
|
||||||
</view>
|
<!-- </mescroll-uni>-->
|
||||||
</uni-col>
|
|
||||||
<uni-col :span="2">
|
|
||||||
<view class="demo-uni-col left-radius">
|
|
||||||
<text>{{ item.nickName || item.userName }}</text>
|
|
||||||
</view>
|
|
||||||
</uni-col>
|
|
||||||
<block v-for="(field, i) in WorkType">
|
|
||||||
<uni-col :span="3">
|
|
||||||
<view class="demo-uni-col mar-left color-white" @click="handleDetail(index, i)"
|
|
||||||
:style="{ backgroundColor: COLOR_MAP[item[field]] }"
|
|
||||||
><!--@click="handleView(index, i)"-->
|
|
||||||
<text v-if="item[field]">{{ item[field] }}</text>
|
|
||||||
<text v-else style="color: gray">暂无</text>
|
|
||||||
</view>
|
|
||||||
</uni-col>
|
|
||||||
</block>
|
|
||||||
</uni-row>
|
|
||||||
</block>
|
|
||||||
</view>
|
|
||||||
<view v-else style="text-align: center; margin-top: 50%; color: white">
|
|
||||||
暂无数据
|
|
||||||
</view>
|
|
||||||
<!-- </mescroll-uni>-->
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -144,10 +143,7 @@ const mescrollRef = ref(null);
|
|||||||
const upOption = ref({
|
const upOption = ref({
|
||||||
page: {num: 0, size: 10},
|
page: {num: 0, size: 10},
|
||||||
noMoreSize: 5,
|
noMoreSize: 5,
|
||||||
empty: {
|
empty: {tip: '~ 空空如也 ~'},
|
||||||
tip: '~ 空空如也 ~',
|
|
||||||
icon: "../../../../static/images/mescroll-empty.png"
|
|
||||||
},
|
|
||||||
textLoading: '加载中...',
|
textLoading: '加载中...',
|
||||||
textNoMore: '已经到底了'
|
textNoMore: '已经到底了'
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user