diff --git a/pages/logistics/index.vue b/pages/logistics/index.vue index a5b6cbf..cafb95b 100644 --- a/pages/logistics/index.vue +++ b/pages/logistics/index.vue @@ -95,6 +95,9 @@ }).then(res => { this.orderlist = [] this.orderlist = res.data.data + if (this.orderlist.length < 15) { + this.status = 'nomore' + } }) } @@ -122,6 +125,7 @@ this.getOrderList() }, + onReachBottom() { if (this.flag) return this.status = "loading" @@ -143,6 +147,7 @@ }) }, + } diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue index ca294d5..4a3f178 100644 --- a/subpkg/property/index.vue +++ b/subpkg/property/index.vue @@ -348,43 +348,7 @@ }, onLoad() { - let type = (JSON.parse(Cache.get("USER_INFO")).company.company_type) - this.company_type = type - // 小组公司 - if (type == 18) { - // getvehicleDetailApi().then(res => {}) - villageCompanyApi().then(res => { - this.showLoading = false - this.datas = res.data - this.step = res.data?.status || 9999 - switch (this.step) { - case 3: - uni.redirectTo({ - url: `/subpkg/property/vehicle_a?id=${res.data.cars_info.id}` - }) - // this.step = - break; - default: - break; - } - }) - - } - // 镇街公司 - else { - getvehicleListApi().then(res => { - this.datas = res.data - res.data.apply.length >= 2 ? this.applicationList = res.data.apply : this.applicationList = res - .data.apply.slice(0, 2) - // this.applicationList = res.data.apply - this.dataList = res.data.car_list - this.showLoading = false - }) - // getAgencyListApi().then(res => { - // this.applicationList = res.data - // }) - } // if (true) { // uni.navigateTo({ // url: '/subpkg/property/vehicle_a' @@ -398,18 +362,56 @@ // // this.applicationList=res // }) + this.initIndex() setTimeout(() => { this.flag = true }) }, - + onPullDownRefresh() { + this.initIndex() + // 模拟上拉刷新 + // setTimeout(() => { + // const newList = this.hostProduct.reverse(); + // this.hostProduct = newList; + uni.stopPullDownRefresh(); + // }, 500) + }, methods: { + // 初始化页面 + initIndex() { + let type = (JSON.parse(Cache.get("USER_INFO")).company.company_type) + this.company_type = type + // 小组公司 + if (type == 18) { + villageCompanyApi().then(res => { + this.showLoading = false + this.datas = res.data + this.step = res.data?.status || 9999 + if (this.step == 3) { + uni.redirectTo({ + url: `/subpkg/property/vehicle_a?id=${res.data.cars_info.id}` + }) + } + }) + + } + // 镇街公司 + else { + getvehicleListApi().then(res => { + this.datas = res.data + res.data.apply.length >= 2 ? this.applicationList = res.data.apply : this.applicationList = + res + .data.apply.slice(0, 2) + this.dataList = res.data.car_list + this.showLoading = false + }) + } + }, async afterReadAvatar(event) { upLoadImage({ filePath: event.file.url, - }).then(res => { this.imgUrl = res.data.uri // this.formData.avatar = res.data.uri