|
@@ -61,14 +61,14 @@
|
|
</navigator>
|
|
</navigator>
|
|
</view>
|
|
</view>
|
|
<view class="loading-text">
|
|
<view class="loading-text">
|
|
- <!-- {{ item.finish ? '没有更多数据了~' : '正在加载...' }} -->
|
|
|
|
|
|
+ {{ total === waybillDelivery.length ? '没有更多数据了~' : '正在加载...' }}
|
|
</view>
|
|
</view>
|
|
</scroll-view>
|
|
</scroll-view>
|
|
</view>
|
|
</view>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script setup lang="ts">
|
|
<script setup lang="ts">
|
|
-import { ref } from 'vue'
|
|
|
|
|
|
+import { reactive, ref } from 'vue'
|
|
import { onLoad, onNavigationBarButtonTap } from '@dcloudio/uni-app'
|
|
import { onLoad, onNavigationBarButtonTap } from '@dcloudio/uni-app'
|
|
import { checkPermission } from '@/utils'
|
|
import { checkPermission } from '@/utils'
|
|
import { waybillPickUpOrders } from '@/services/waybillPickUpOrder'
|
|
import { waybillPickUpOrders } from '@/services/waybillPickUpOrder'
|
|
@@ -82,10 +82,15 @@ const loading = ref(false)
|
|
const loadingBtn = ref(false)
|
|
const loadingBtn = ref(false)
|
|
const searchValue = ref()
|
|
const searchValue = ref()
|
|
const waybillDelivery = ref([] as any)
|
|
const waybillDelivery = ref([] as any)
|
|
|
|
+const total = ref()
|
|
const messageType = ref()
|
|
const messageType = ref()
|
|
const messageText = ref()
|
|
const messageText = ref()
|
|
const messageRef = ref()
|
|
const messageRef = ref()
|
|
const showRightRef = ref()
|
|
const showRightRef = ref()
|
|
|
|
+const params = reactive({
|
|
|
|
+ page: 1,
|
|
|
|
+ limit: 10,
|
|
|
|
+})
|
|
|
|
|
|
const resetForm = () => {}
|
|
const resetForm = () => {}
|
|
const confirmForm = () => {
|
|
const confirmForm = () => {
|
|
@@ -310,13 +315,14 @@ const cancelFedExPickUp = (data: { id: any }) => {
|
|
|
|
|
|
const getList = async () => {
|
|
const getList = async () => {
|
|
loading.value = true
|
|
loading.value = true
|
|
-
|
|
|
|
- const res = await waybillPickUpOrders()
|
|
|
|
|
|
+ params.page = 1
|
|
|
|
+ const res = await waybillPickUpOrders(params)
|
|
|
|
|
|
loading.value = false
|
|
loading.value = false
|
|
console.log(res)
|
|
console.log(res)
|
|
if (res.code == 1) {
|
|
if (res.code == 1) {
|
|
waybillDelivery.value = res.data.list
|
|
waybillDelivery.value = res.data.list
|
|
|
|
+ total.value = res.data.total
|
|
} else {
|
|
} else {
|
|
messageType.value = 'error'
|
|
messageType.value = 'error'
|
|
messageText.value = res.msg
|
|
messageText.value = res.msg
|
|
@@ -335,28 +341,21 @@ onNavigationBarButtonTap((event) => {
|
|
|
|
|
|
// 滚动触底
|
|
// 滚动触底
|
|
const onScrolltolower = async () => {
|
|
const onScrolltolower = async () => {
|
|
- // // 获取当前选项
|
|
|
|
- // const currsubTypes = subTypes.value[activeIndex.value]
|
|
|
|
- // // 分页条件
|
|
|
|
- // if (currsubTypes.goodsItems.page < currsubTypes.goodsItems.pages) {
|
|
|
|
- // // 当前页码累加
|
|
|
|
- // currsubTypes.goodsItems.page++
|
|
|
|
- // } else {
|
|
|
|
- // // 标记已结束
|
|
|
|
- // currsubTypes.finish = true
|
|
|
|
- // // 退出并轻提示
|
|
|
|
- // return uni.showToast({ icon: 'none', title: '没有更多数据了~' })
|
|
|
|
- // }
|
|
|
|
- // // 调用API传参
|
|
|
|
- // const res = await getHotRecommendAPI(currUrlMap!.url, {
|
|
|
|
- // subType: currsubTypes.id,
|
|
|
|
- // page: currsubTypes.goodsItems.page,
|
|
|
|
- // pageSize: currsubTypes.goodsItems.pageSize,
|
|
|
|
- // })
|
|
|
|
- // // 新的列表选项
|
|
|
|
- // const newsubTypes = res.result.subTypes[activeIndex.value]
|
|
|
|
- // // 数组追加
|
|
|
|
- // currsubTypes.goodsItems.items.push(...newsubTypes.goodsItems.items)
|
|
|
|
|
|
+ // 分页条件
|
|
|
|
+ if (waybillDelivery.value.length < total.value) {
|
|
|
|
+ // 当前页码累加
|
|
|
|
+ params.page++
|
|
|
|
+ } else {
|
|
|
|
+ // 退出并轻提示
|
|
|
|
+ return uni.showToast({ icon: 'none', title: '没有更多数据了~' })
|
|
|
|
+ }
|
|
|
|
+ // 调用API传参
|
|
|
|
+ const res = await waybillPickUpOrders(params)
|
|
|
|
+ if (res.code == 1) {
|
|
|
|
+ // 数组追加
|
|
|
|
+ waybillDelivery.value.push(...res.data.list)
|
|
|
|
+ total.value = res.data.total
|
|
|
|
+ }
|
|
}
|
|
}
|
|
</script>
|
|
</script>
|
|
|
|
|
|
@@ -488,4 +487,10 @@ page {
|
|
margin-right: 10rpx;
|
|
margin-right: 10rpx;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+.loading-text {
|
|
|
|
+ text-align: center;
|
|
|
|
+ font-size: 28rpx;
|
|
|
|
+ color: #666;
|
|
|
|
+ padding: 20rpx 0 50rpx;
|
|
|
|
+}
|
|
</style>
|
|
</style>
|