Showing
2 changed files
with
9 additions
and
21 deletions
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | * @Author: hookehuyr hookehuyr@gmail.com | 2 | * @Author: hookehuyr hookehuyr@gmail.com |
| 3 | * @Date: 2022-05-30 13:51:47 | 3 | * @Date: 2022-05-30 13:51:47 |
| 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 5 | - * @LastEditTime: 2022-06-02 16:33:56 | 5 | + * @LastEditTime: 2022-06-24 23:43:11 |
| 6 | * @FilePath: /tswj/src/views/client/donateList.vue | 6 | * @FilePath: /tswj/src/views/client/donateList.vue |
| 7 | * @Description: 幼儿园捐赠人捐赠金额排行榜 | 7 | * @Description: 幼儿园捐赠人捐赠金额排行榜 |
| 8 | --> | 8 | --> |
| ... | @@ -34,7 +34,7 @@ | ... | @@ -34,7 +34,7 @@ |
| 34 | </van-col> | 34 | </van-col> |
| 35 | </van-row> | 35 | </van-row> |
| 36 | </div> | 36 | </div> |
| 37 | - <van-list v-model:loading="loading" :finished="finished" :finished-text="finishedTextStatus ? '没有更多了' : ''" :immediate-check="false" @load="onLoad"> | 37 | + <van-list v-model:loading="loading" :finished="finished" :finished-text="finishedTextStatus ? '没有更多了' : ''" @load="onLoad"> |
| 38 | <template v-for="(item, key) in donateList" :key="key"> | 38 | <template v-for="(item, key) in donateList" :key="key"> |
| 39 | <div class="van-hairline--bottom"> | 39 | <div class="van-hairline--bottom"> |
| 40 | <van-row style="padding: 0.5rem 1rem;"> | 40 | <van-row style="padding: 0.5rem 1rem;"> |
| ... | @@ -82,20 +82,13 @@ const offset = ref(0) | ... | @@ -82,20 +82,13 @@ const offset = ref(0) |
| 82 | const finishedTextStatus = ref(false); | 82 | const finishedTextStatus = ref(false); |
| 83 | const emptyStatus = ref(false); | 83 | const emptyStatus = ref(false); |
| 84 | 84 | ||
| 85 | -onMounted(async () => { | 85 | +const onLoad = async () => { |
| 86 | const { data } = await kgDonateListAPI({ kg_id, limit: limit.value, offset: offset.value }); | 86 | const { data } = await kgDonateListAPI({ kg_id, limit: limit.value, offset: offset.value }); |
| 87 | kgInfo.value = data; | 87 | kgInfo.value = data; |
| 88 | - donateList.value = data.donate_list; | ||
| 89 | - offset.value = donateList.value.length; | ||
| 90 | // 有空格分割name | 88 | // 有空格分割name |
| 91 | if (kgInfo.value.kg_name.indexOf(' ') > -1) { | 89 | if (kgInfo.value.kg_name.indexOf(' ') > -1) { |
| 92 | kgInfo.value.multi_name = kgInfo.value.kg_name.split(' '); | 90 | kgInfo.value.multi_name = kgInfo.value.kg_name.split(' '); |
| 93 | } | 91 | } |
| 94 | -}) | ||
| 95 | - | ||
| 96 | - | ||
| 97 | -const onLoad = async () => { | ||
| 98 | - const { data } = await kgDonateListAPI({ kg_id, limit: limit.value, offset: offset.value }); | ||
| 99 | donateList.value = [...donateList.value, ...data.donate_list]; | 92 | donateList.value = [...donateList.value, ...data.donate_list]; |
| 100 | offset.value = donateList.value.length; | 93 | offset.value = donateList.value.length; |
| 101 | loading.value = false; | 94 | loading.value = false; | ... | ... |
| ... | @@ -2,8 +2,8 @@ | ... | @@ -2,8 +2,8 @@ |
| 2 | * @Author: hookehuyr hookehuyr@gmail.com | 2 | * @Author: hookehuyr hookehuyr@gmail.com |
| 3 | * @Date: 2022-05-30 13:51:47 | 3 | * @Date: 2022-05-30 13:51:47 |
| 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 5 | - * @LastEditTime: 2022-06-09 16:12:51 | 5 | + * @LastEditTime: 2022-06-24 23:35:50 |
| 6 | - * @FilePath: /tswj/src/views/client/donateList.vue | 6 | + * @FilePath: /tswj/src/views/client/rankList.vue |
| 7 | * @Description: 幼儿园儿童捐赠金额排行榜 | 7 | * @Description: 幼儿园儿童捐赠金额排行榜 |
| 8 | --> | 8 | --> |
| 9 | <template> | 9 | <template> |
| ... | @@ -34,7 +34,7 @@ | ... | @@ -34,7 +34,7 @@ |
| 34 | </van-col> | 34 | </van-col> |
| 35 | </van-row> | 35 | </van-row> |
| 36 | </div> | 36 | </div> |
| 37 | - <van-list v-model:loading="loading" :finished="finished" :finished-text="finishedTextStatus ? '没有更多了' : ''" :immediate-check="false" @load="onLoad"> | 37 | + <van-list v-model:loading="loading" :finished="finished" :finished-text="finishedTextStatus ? '没有更多了' : ''" @load="onLoad"> |
| 38 | <div v-for="(rank, indexKey) in donateRankList" :key="indexKey" class="van-hairline--bottom"> | 38 | <div v-for="(rank, indexKey) in donateRankList" :key="indexKey" class="van-hairline--bottom"> |
| 39 | <van-row style="padding: 0.5rem;"> | 39 | <van-row style="padding: 0.5rem;"> |
| 40 | <van-col span="2"> | 40 | <van-col span="2"> |
| ... | @@ -73,6 +73,8 @@ import { useTitle } from '@/utils/generatePackage.js' | ... | @@ -73,6 +73,8 @@ import { useTitle } from '@/utils/generatePackage.js' |
| 73 | import { icon_avatar, icon_ranking1, icon_ranking2, icon_ranking3, icon_flower, icon_logo, no_image } from '@/utils/generateIcons.js' | 73 | import { icon_avatar, icon_ranking1, icon_ranking2, icon_ranking3, icon_flower, icon_logo, no_image } from '@/utils/generateIcons.js' |
| 74 | //import { } from '@/composables' | 74 | //import { } from '@/composables' |
| 75 | import { kgDonateRankAPI } from '@/api/C/kg.js' | 75 | import { kgDonateRankAPI } from '@/api/C/kg.js' |
| 76 | +import { LIMIT, OFFSET } from '@/constant' | ||
| 77 | + | ||
| 76 | const $route = useRoute(); | 78 | const $route = useRoute(); |
| 77 | useTitle($route.meta.title); | 79 | useTitle($route.meta.title); |
| 78 | 80 | ||
| ... | @@ -86,20 +88,13 @@ const offset = ref(0) | ... | @@ -86,20 +88,13 @@ const offset = ref(0) |
| 86 | const finishedTextStatus = ref(false); | 88 | const finishedTextStatus = ref(false); |
| 87 | const emptyStatus = ref(false); | 89 | const emptyStatus = ref(false); |
| 88 | 90 | ||
| 89 | -onMounted(async () => { | 91 | +const onLoad = async () => { |
| 90 | const { data } = await kgDonateRankAPI({ kg_id, limit: limit.value, offset: offset.value }); | 92 | const { data } = await kgDonateRankAPI({ kg_id, limit: limit.value, offset: offset.value }); |
| 91 | kgInfo.value = data; | 93 | kgInfo.value = data; |
| 92 | - donateRankList.value = data.rank_list; | ||
| 93 | - offset.value = donateRankList.value.length; | ||
| 94 | // 有空格分割name | 94 | // 有空格分割name |
| 95 | if (kgInfo.value.kg_name.indexOf(' ') > -1) { | 95 | if (kgInfo.value.kg_name.indexOf(' ') > -1) { |
| 96 | kgInfo.value.multi_name = kgInfo.value.kg_name.split(' '); | 96 | kgInfo.value.multi_name = kgInfo.value.kg_name.split(' '); |
| 97 | } | 97 | } |
| 98 | -}) | ||
| 99 | - | ||
| 100 | - | ||
| 101 | -const onLoad = async () => { | ||
| 102 | - const { data } = await kgDonateRankAPI({ kg_id, limit: limit.value, offset: offset.value }); | ||
| 103 | donateRankList.value = [...donateRankList.value, ...data.rank_list]; | 98 | donateRankList.value = [...donateRankList.value, ...data.rank_list]; |
| 104 | offset.value = donateRankList.value.length; | 99 | offset.value = donateRankList.value.length; |
| 105 | loading.value = false; | 100 | loading.value = false; | ... | ... |
-
Please register or login to post a comment