mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
weipengfei 2023-12-28 18:04:37 +08:00
parent 399b23d44f
commit dbe08640e9
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pages/store/home/index.vue
View File

@ -670,7 +670,7 @@
type: 3, type: 3,
statusBarHeight: 0, statusBarHeight: 0,
isLihaiYun: '', isLihaiYun: '',
screenHeight: 0,
} }
}, },
computed: { computed: {
@ -744,6 +744,7 @@
this.isCoupon = options.coupon || 0; this.isCoupon = options.coupon || 0;
this.diyActive = options.order || 0; this.diyActive = options.order || 0;
this.order = options.order; this.order = options.order;
this.screenHeight = uni.getSystemInfoSync().screenHeight;
if (options.spid) { if (options.spid) {
this.currSpid = options.spid this.currSpid = options.spid
app.globalData.spid = options.spid; app.globalData.spid = options.spid;
@ -866,8 +867,10 @@
if (this.goodsLoading) return; if (this.goodsLoading) return;
const query = uni.createSelectorQuery().in(this); const query = uni.createSelectorQuery().in(this);
query.select('#goods').boundingClientRect(data => { query.select('#goods').boundingClientRect(data => {
if (data.bottom < 1500 && data.top < 0) { console.log(data.bottom,data.top);
this.getGoods(); if (data.bottom < 1500+this.screenHeight && data.top < 0) {
if(this.type==7) this.getProductSpu();
else this.getGoods();
// if (this.loadend == false) { // if (this.loadend == false) {
// this.getProductSpu() // this.getProductSpu()
// } else {; // } else {;
@ -883,7 +886,7 @@
if (this.goodsLoading) return; if (this.goodsLoading) return;
const query = uni.createSelectorQuery().in(this); const query = uni.createSelectorQuery().in(this);
query.select('#product').boundingClientRect(data => { query.select('#product').boundingClientRect(data => {
if (data.bottom < 1500 && data.top < 0) { if (data.bottom < 1500+this.screenHeight && data.top < 0) {
this.get_service_list(); this.get_service_list();
} }
}).exec(); }).exec();
@ -1270,6 +1273,7 @@
}, },
onReachBottom() { onReachBottom() {
console.log('触底');
// 模拟触底刷新 // 模拟触底刷新
if (this.tabActive == 0) { if (this.tabActive == 0) {
setTimeout(() => { setTimeout(() => {

4
pages/store/settled/index.vue
View File

@ -536,8 +536,8 @@ import { Toast } from '../../../libs/uniApi';
let area = self.business[0].find(item=>item.code==self.area_id)?.name; let area = self.business[0].find(item=>item.code==self.area_id)?.name;
let street = self.business[1].find(item=>item.code==self.street_id)?.name; let street = self.business[1].find(item=>item.code==self.street_id)?.name;
let village = self.business[2].find(item=>item.id==self.village_id)?.name; let village = self.business[2].find(item=>item.id==self.village_id)?.name;
// console.log(area, street, village); this.business_name = `${area} ${street} ${village}`;
this.business_name = `${area} ${street} ${village}` this.getArea();
} }
}) })
}, },