HB
/
ruoyi-miniapp
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

增加空列表显示

master
爱~海~爱海爱海~右 1 month ago
parent
b2728bcea5
commit
70d02391bf
13 changed files with 136 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      components/cs-bottom-wrapper/index.vue
  2. 6
      components/cs-dict-tag/index.vue
  3. 50
      components/cs-emty/index.vue
  4. 4
      components/cs-text-more/index.vue
  5. 15
      config.js
  6. 39
      pages/enterprise.vue
  7. 41
      pages/index.vue
  8. 2
      pages/login.vue
  9. 6
      pages/owner.vue
  10. 29
      pages/task.vue
  11. 5
      sub/enterprise/detail.vue
  12. 2
      sub/task/detail.vue
  13. 6
      sub/task/record.vue

2
components/cs-bottom-wrapper/index.vue
Unescape View File

@ -29,7 +29,7 @@ export default {
z-index: 99; z-index: 99;
border-top: 1px solid #f1f1f4; border-top: 1px solid #f1f1f4;
.safe { .safe {
height: 20px; height: 40rpx;
} }
} }
</style> </style>

6
components/cs-dict-tag/index.vue
Unescape View File

@ -97,9 +97,9 @@ export default {
color: #99a1b7; color: #99a1b7;
} }
.dict-tag { .dict-tag {
min-width: 100px; min-width: 200rpx;
text-align: center; text-align: center;
font-size: 12px; font-size: 24rpx;
padding: 4px 20px; padding: 16rpx 40rpx;
} }
</style> </style>

50
components/cs-emty/index.vue
Unescape View File

@ -0,0 +1,50 @@
<template>
<view class="cs-empty" :style="{ marginTop: marginTop + 'rpx' }">
<image
class="empty-image"
src="/static/images/emty.png"
mode="aspectFit"
/>
<text class="empty-text">{{ text }}</text>
<slot></slot>
</view>
</template>
<script>
export default {
name: 'cs-empty',
props: {
// 显示的文字
text: {
type: String,
default: '暂无数据'
},
// 上边距
marginTop: {
type: Number,
default: 0
}
}
}
</script>
<style lang="scss" scoped>
.cs-empty {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
background-color: #fff;
height: 856rpx;
border-radius: 24rpx;
gap: 24rpx;
.empty-image {
width: 158rpx;
height: 158rpx;
}
.empty-text {
font-size: 32rpx;
color: #99a1b7;
}
}
</style>

4
components/cs-text-more/index.vue
Unescape View File

@ -2,7 +2,7 @@
<view :style="{ color }"> <view :style="{ color }">
<view <view
style=" style="
font-size: 13px; font-size: 26rpx;
line-height: 160%; line-height: 160%;
position: relative; position: relative;
transform: 0.2s all; transform: 0.2s all;
@ -15,7 +15,7 @@
<view <view
v-else v-else
style=" style="
font-size: 13px; font-size: 26rpx;
line-height: 160%; line-height: 160%;
position: relative; position: relative;
transform: 0.2s all; transform: 0.2s all;

15
config.js
Unescape View File

@ -1,21 +1,22 @@
// 应用全局配置 // 应用全局配置
module.exports = { module.exports = {
// baseUrl: 'http://188.188.3.166:48080', // baseUrl: 'http://188.188.5.188:48080',
// baseUrl: 'https://hb.jzce.com', // baseUrl: 'https://hb.jzce.com',
baseUrl: 'http://188.188.3.232:48080', baseUrl: 'http://188.188.3.232:48080',
// baseUrl: 'http://localhost:48080',
baseApi: '/admin-api', baseApi: '/admin-api',
imgUrl: 'https://hb.jzce.com', imgUrl: 'https://hb.jzce.com',
// 应用信息 // 应用信息
appInfo: { appInfo: {
// 应用名称 // 应用名称
name: "nature-secure-miniapp", name: 'nature-secure-miniapp',
// 应用版本 // 应用版本
version: "1.0.0", version: '1.0.0',
// 应用logo // 应用logo
logo: "/static/logo.png", logo: '/static/logo.png',
// 官方网站 // 官方网站
site_url: "", site_url: '',
// 政策协议 // 政策协议
agreements: [] agreements: [],
} },
} }

39
pages/enterprise.vue
Unescape View File

@ -116,8 +116,9 @@
:status="load" :status="load"
marginTop="12" marginTop="12"
marginBottom="12" marginBottom="12"
v-if="load == 'nomore'" v-if="load !== 'nomore'"
/> />
<cs-emty v-if="list.length == 0"></cs-emty>
</scroll-view> </scroll-view>
</view> </view>
</cs-page> </cs-page>
@ -320,18 +321,18 @@ export default {
.list { .list {
display: flex; display: flex;
flex-flow: column nowrap; flex-flow: column nowrap;
gap: 12px; gap: 24rpx;
padding: 0 12px; padding: 0 24rpx;
} }
.enterprise { .enterprise {
padding: 12px; padding: 24rpx;
background-color: #fff; background-color: #fff;
border-radius: $cs-border-radius; border-radius: $cs-border-radius;
gap: 12px; gap: 24rpx;
margin-top: 12px; margin-top: 24rpx;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
font-size: 12px; font-size: 24rpx;
.address { .address {
color: $uni-text-color-grey; color: $uni-text-color-grey;
} }
@ -339,40 +340,40 @@ export default {
background-color: $cs-color-touch; background-color: $cs-color-touch;
} }
.tagList { .tagList {
margin-top: 8px; margin-top: 16rpx;
display: flex; display: flex;
gap: 4px; gap: 8rpx;
color: $uni-text-color-grey; color: $uni-text-color-grey;
flex-flow: row wrap; flex-flow: row wrap;
.tag { .tag {
font-size: 12px; font-size: 24rpx;
display: flex; display: flex;
padding: 2px 6px; padding: 4rpx 12rpx;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
border-radius: 2px; border-radius: 4rpx;
background: #f9f9f9; background: #f9f9f9;
} }
} }
.audit { .audit {
position: absolute; position: absolute;
right: -19px; right: -38rpx;
top: 6px; top: 12rpx;
transform: rotateZ(45deg); transform: rotateZ(45deg);
transform-origin: 50% 50%; transform-origin: 50% 50%;
padding: 4px 20px; padding: 8rpx 40rpx;
font-size: 12px; font-size: 24rpx;
text-align: center; text-align: center;
} }
} }
::v-deep .van-dropdown-menu { ::v-deep .van-dropdown-menu {
box-shadow: none; box-shadow: none;
height: 35px; height: 70rpx;
font-size: 13px; font-size: 26rpx;
border-bottom: 1px solid #f1f1f4; border-bottom: 1px solid #f1f1f4;
} }
::v-deep .u-list { ::v-deep .u-list {
padding: 12px; padding: 24rpx;
} }
</style> </style>

41
pages/index.vue
Unescape View File

@ -287,8 +287,12 @@ export default {
const res = await HomeApi.getPieData(this.queryParams) const res = await HomeApi.getPieData(this.queryParams)
this.detail = res.data this.detail = res.data
let curIndex = 0 let curIndex = 0
const split = 1 / this.detail.completionRate.length
const data = this.detail.completionRate.map((item, index) => { const data = this.detail.completionRate.map((item, index) => {
const res = { ...item, color: this.color[curIndex] } const res = {
...item,
color: `rgba(4, 180, 64,${split * (index + 1)})`
}
curIndex > this.color.length ? 0 : curIndex++ curIndex > this.color.length ? 0 : curIndex++
return res return res
}) })
@ -384,6 +388,13 @@ export default {
} else { } else {
e.detail.callback(true) e.detail.callback(true)
} }
},
numFilter(value) {
// 先保留三位小数
let tempVal = parseFloat(value).toFixed(3)
// 然后截取前两位小数
let realVal = tempVal.substring(0, tempVal.length - 1)
return realVal
} }
} }
} }
@ -394,25 +405,25 @@ export default {
height: 100%; height: 100%;
} }
.view { .view {
padding: 0 12px; padding: 0 24rpx;
padding-bottom: 12px; padding-bottom: 24rpx;
display: flex; display: flex;
gap: 12px; gap: 24rpx;
flex-flow: column nowrap; flex-flow: column nowrap;
.box { .box {
padding: 12px; padding: 24rpx;
background-color: #fff; background-color: #fff;
border: 1px solid #f9f9f9; border: 2rpx solid #f9f9f9;
border-radius: 12px; border-radius: 24rpx;
margin-top: 12px; margin-top: 24rpx;
&:last-child { &:last-child {
margin-bottom: 12px; margin-bottom: 24rpx;
} }
} }
.row-1 { .row-1 {
display: flex; display: flex;
flex-flow: column nowrap; flex-flow: column nowrap;
gap: 12px; gap: 24rpx;
} }
.people-name { .people-name {
max-width: 4rem; max-width: 4rem;
@ -423,7 +434,7 @@ export default {
} }
.tab { .tab {
position: relative; position: relative;
padding: 4px 16px; padding: 16rpx 32rpx;
.name { .name {
z-index: 2; z-index: 2;
position: inherit; position: inherit;
@ -434,7 +445,7 @@ export default {
position: absolute; position: absolute;
inset: 0; inset: 0;
background-color: #fff; background-color: #fff;
border-radius: 2px; border-radius: 4rpx;
transform: translateX(calc(var(--index) * 100%)); transform: translateX(calc(var(--index) * 100%));
transition: 0.2s all; transition: 0.2s all;
z-index: 1; z-index: 1;
@ -443,8 +454,8 @@ export default {
} }
::v-deep .van-dropdown-menu { ::v-deep .van-dropdown-menu {
box-shadow: none; box-shadow: none;
height: 35px !important; height: 70rpx !important;
font-size: 13px; font-size: 26rpx;
border-bottom: 1px solid #f1f1f4; border-bottom: 2rpx solid #f1f1f4;
} }
</style> </style>

2
pages/login.vue
Unescape View File

@ -131,7 +131,7 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
flex-flow: column nowrap; flex-flow: column nowrap;
gap: 20px; gap: 40rpx;
background: var(--LightMode-Success-Success, #17c653); background: var(--LightMode-Success-Success, #17c653);
.title { .title {

6
pages/owner.vue
Unescape View File

@ -221,14 +221,14 @@ export default {
.header { .header {
display: flex; display: flex;
flex-flow: row nowrap; flex-flow: row nowrap;
gap: 10px; gap: 20rpx;
align-items: center; align-items: center;
.title { .title {
font-size: 16px; font-size: 32rpx;
} }
} }
.owner-container { .owner-container {
padding: 10px; padding: 20rpx;
height: 100%; height: 100%;
.section { .section {
border-radius: $cs-border-radius; border-radius: $cs-border-radius;

29
pages/task.vue
Unescape View File

@ -128,8 +128,9 @@
:status="load" :status="load"
marginTop="12" marginTop="12"
marginBottom="12" marginBottom="12"
v-if="load == 'nomore'" v-if="load !== 'nomore'"
/> />
<cs-emty v-if="list.length == 0"></cs-emty>
</scroll-view> </scroll-view>
</view> </view>
</cs-page> </cs-page>
@ -307,17 +308,17 @@ export default {
overflow: hidden; overflow: hidden;
} }
.list { .list {
padding: 0 12px; padding: 0 24rpx;
} }
.enterprise { .enterprise {
padding: 12px; padding: 24rpx;
background-color: #fff; background-color: #fff;
border-radius: $cs-border-radius; border-radius: $cs-border-radius;
gap: 12px; gap: 24rpx;
margin-top: 12px; margin-top: 24rpx;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
font-size: 12px; font-size: 24rpx;
&:active { &:active {
background-color: $cs-color-touch; background-color: $cs-color-touch;
} }
@ -325,18 +326,18 @@ export default {
color: $uni-text-color-grey; color: $uni-text-color-grey;
} }
.tagList { .tagList {
margin-top: 8px; margin-top: 16rpx;
display: flex; display: flex;
gap: 4px; gap: 8rpx;
color: $uni-text-color-grey; color: $uni-text-color-grey;
display: flex; display: flex;
.tag { .tag {
font-size: 12px; font-size: 24rpx;
display: flex; display: flex;
padding: 2px 6px; padding: 4rpx 12rpx;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
border-radius: 2px; border-radius: 4rpx;
background: #f9f9f9; background: #f9f9f9;
} }
} }
@ -353,13 +354,13 @@ export default {
} }
::v-deep .van-dropdown-menu { ::v-deep .van-dropdown-menu {
box-shadow: none; box-shadow: none;
height: 35px !important; height: 70rpx !important;
font-size: 13px; font-size: 26rpx;
border-bottom: 1px solid #f1f1f4; border-bottom: 1px solid #f1f1f4;
} }
::v-deep .u-list { ::v-deep .u-list {
padding: 12px; padding: 24rpx;
} }
::v-deep .u-count-num { ::v-deep .u-count-num {

5
sub/enterprise/detail.vue
Unescape View File

@ -126,10 +126,9 @@
</view> </view>
</cs-bottom-wrapper> </cs-bottom-wrapper>
<cs-bottom-wrapper v-else> <cs-bottom-wrapper v-if="isChange">
<view class="operation"> <view class="operation">
<view class="btn green" v-if="isChange">认领该企业</view> <view class="btn green" >认领该企业</view>
<view class="btn red" v-else>删除该企业</view>
</view> </view>
</cs-bottom-wrapper> </cs-bottom-wrapper>

2
sub/task/detail.vue
Unescape View File

@ -170,6 +170,8 @@
marginBottom="12" marginBottom="12"
v-if="load != 'nomore'" v-if="load != 'nomore'"
/> />
<cs-emty v-if="list.length == 0"></cs-emty>
<view class="btn-box" v-if="isSelect.length > 0"> <view class="btn-box" v-if="isSelect.length > 0">
<view class="confirm-btn" @tap="replay"> <view class="confirm-btn" @tap="replay">
已选择({{ isSelect.length }}) 已选择({{ isSelect.length }})

6
sub/task/record.vue
Unescape View File

@ -34,7 +34,7 @@
</view> </view>
<view <view
style=" style="
font-size: 13px; font-size: 26rpx;
line-height: 160%; line-height: 160%;
position: relative; position: relative;
transform: 0.2s all; transform: 0.2s all;
@ -46,7 +46,7 @@
<view <view
v-else v-else
style=" style="
font-size: 13px; font-size: 26rpx;
line-height: 160%; line-height: 160%;
position: relative; position: relative;
transform: 0.2s all; transform: 0.2s all;
@ -58,7 +58,7 @@
? detail.description ? detail.description
: `${detail.description.slice(1, 20)}...` : `${detail.description.slice(1, 20)}...`
}} }}
<text style="color: #17c653; padding-left: 4px"> <text style="color: #17c653; padding-left: 8rpx">
{{ isShowAllText ? '收起' : '展开' }} {{ isShowAllText ? '收起' : '展开' }}
</text> </text>
</view> </view>

Write Preview
Loading…
Cancel
Save