Commit c335851b authored by “yiyousong”'s avatar “yiyousong”

fix:修改首页

parent 7bd0bf3e
...@@ -14,11 +14,15 @@ ...@@ -14,11 +14,15 @@
<div class="right flex"> <div class="right flex">
<p class="flex aic mr25"> <p class="flex aic mr25">
<span class="tips-name"> 今日节约能量: </span> <span class="tips-name"> 今日节约能量: </span>
<span class="count count1">{{ homeInfo.dayThrift }}g</span> <span class="count count1">{{
homeInfo.dayThrift ?? 0 | filterCount
}}</span>
</p> </p>
<p class="flex aic"> <p class="flex aic">
<span class="tips-name"> 累计节约能量: </span> <span class="tips-name"> 累计节约能量: </span>
<span class="count count2">{{ homeInfo.totalThrift }}kg</span> <span class="count count2">{{
homeInfo.totalThrift ?? 0 | filterCount
}}</span>
</p> </p>
</div> </div>
</div> </div>
...@@ -59,12 +63,12 @@ ...@@ -59,12 +63,12 @@
> >
<span <span
:data-value="v" :data-value="v"
v-if="v.length <= 6" v-if="v?.length <= 6"
class="hot-search-item" class="hot-search-item"
>{{ v }}</span >{{ v }}</span
> >
<span :data-value="v" v-else class="hot-search-item">{{ <span :data-value="v" v-else class="hot-search-item">{{
v.slice(0, 6) + "..." v?.slice(0, 6) + "..."
}}</span> }}</span>
<span class="line"></span> <span class="line"></span>
</div> </div>
...@@ -157,7 +161,7 @@ ...@@ -157,7 +161,7 @@
<span class="data-name">入驻表单量:</span> <span class="data-name">入驻表单量:</span>
<div class="count-box"> <div class="count-box">
<span class="data-count" v-format="'#,##0'">{{ <span class="data-count" v-format="'#,##0'">{{
homeInfo.datumCont homeInfo.datumCont ?? 0
}}</span> }}</span>
<span></span> <span></span>
</div> </div>
...@@ -167,7 +171,7 @@ ...@@ -167,7 +171,7 @@
<span class="data-name">入驻事项量:</span> <span class="data-name">入驻事项量:</span>
<div class="count-box"> <div class="count-box">
<span class="data-count" v-format="'#,##0'">{{ <span class="data-count" v-format="'#,##0'">{{
homeInfo.matterCont homeInfo.matterCont ?? 0
}}</span> }}</span>
<span></span> <span></span>
</div> </div>
...@@ -214,6 +218,21 @@ export default { ...@@ -214,6 +218,21 @@ export default {
created() { created() {
this.getHomeInfo(); this.getHomeInfo();
}, },
filters: {
filterCount(val) {
if (val >= 1000 && val < 10000) {
let num = val / 1000;
return num.toFixed(2) + "kg";
} else if (val >= 10000 && val < 999000) {
let num = val / 10000;
return num.toFixed(1) + "万kg";
} else if (val >= 999000) {
return `999+万kg`;
} else {
return val + "g";
}
},
},
methods: { methods: {
// 获取首页数据展示 // 获取首页数据展示
async getHomeInfo() { async getHomeInfo() {
...@@ -221,6 +240,7 @@ export default { ...@@ -221,6 +240,7 @@ export default {
let { data, code } = res.data; let { data, code } = res.data;
if (code === 1) { if (code === 1) {
// data.hotWords = data.hotWords.split(","); // data.hotWords = data.hotWords.split(",");
// data.hotWords = data.hotWords.map((v) => v.hotwords);
this.homeInfo = data; this.homeInfo = data;
this.matterList = data.matterList; this.matterList = data.matterList;
this.datumList = data.datumList; this.datumList = data.datumList;
......
...@@ -55,7 +55,7 @@ export default { ...@@ -55,7 +55,7 @@ export default {
.dept-list { .dept-list {
width: 100%; width: 100%;
height: calc(100vh - 110px); height: calc(100vh - 110px);
padding: 15px 0px; padding-bottom: 15px;
overflow-y: auto; overflow-y: auto;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 4px; width: 4px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment