center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'v1.6' of github.com:dataease/dataease into v1.6

Browse Source
This commit is contained in:
taojinlong 2022-01-04 17:12:38 +08:00
commit 24a053e7ce
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mobile/src/pages/tabBar/dir/index.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<view class="page"> <view class="page de-main">
<swiper indicator-dots="true"> <!-- <swiper indicator-dots="true">
<swiper-item v-for="(img, key) in imgUrls" :key="key"><image :src="img" /></swiper-item> <swiper-item v-for="(img, key) in imgUrls" :key="key"><image :src="img" /></swiper-item>
</swiper> </swiper> -->
<view class=" "> <view class=" ">
<view class="uni-title"> <view class="uni-title">
@ -100,4 +100,7 @@ swiper,
.page-section-title { .page-section-title {
margin-top: 50rpx; margin-top: 50rpx;
} }
.de-main {
padding-top: 60rpx;
}
</style> </style>

26
mobile/src/pages/tabBar/home/index.nvue
View File

@ -14,11 +14,28 @@
<view v-for="(newsitem,index2) in tab.data" :key="newsitem.id"> <view v-for="(newsitem,index2) in tab.data" :key="newsitem.id">
<media-item :options="newsitem" @close="close(index1,index2)" @click="goDetail(newsitem)"></media-item> <media-item :options="newsitem" @close="close(index1,index2)" @click="goDetail(newsitem)"></media-item>
</view> </view>
<view class="loading-more" v-if="tab.isLoading || tab.data.length > 12"> <view class="loading-more" v-if="tab.isLoading">
<text class="loading-more-text">{{tab.loadingText}}</text> <text class="loading-more-text">{{tab.loadingText}}</text>
</view> </view>
</scroll-view> </scroll-view>
<!-- #endif --> <!-- #endif -->
<!-- <uni-list>
<uni-list-item
v-for="(node, i) in tab.data"
:key="i"
clickable
@click="goDetail(node)"
:title="node.title"
thumb="../../../static/yibiaobans.png"
thumb-size="base"
:rightText="node.rightText"
/>
</uni-list> -->
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
@ -112,6 +129,7 @@
} }
} }
activeTab.isLoading = false
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}) })
@ -170,10 +188,12 @@
} }
}) })
}, },
loadMore(e) { loadMore(index) {
let activeTab = this.newsList[index]
activeTab.isLoading = true
setTimeout(() => { setTimeout(() => {
this.getList(this.tabIndex); this.getList(this.tabIndex);
}, 500) }, 1000)
}, },
ontabtap(e) { ontabtap(e) {
let index = e.target.dataset.current || e.currentTarget.dataset.current; let index = e.target.dataset.current || e.currentTarget.dataset.current;