修复bug
This commit is contained in:
parent
d58a4f3705
commit
fe899f95f1
|
@ -332,7 +332,7 @@
|
||||||
|
|
||||||
|
|
||||||
let that = this;
|
let that = this;
|
||||||
console.log(that.merId)
|
// console.log(that.merId)
|
||||||
if (that.loading || that.loaded) return;
|
if (that.loading || that.loaded) return;
|
||||||
that.loading = true;
|
that.loading = true;
|
||||||
if (that.where.status == 6) {
|
if (that.where.status == 6) {
|
||||||
|
|
|
@ -563,8 +563,10 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onPullDownRefresh() {
|
onPullDownRefresh() {
|
||||||
this.getGoods(true)
|
|
||||||
uni.stopPullDownRefresh()
|
this.getGoods(true).then(()=>{
|
||||||
|
uni.stopPullDownRefresh()
|
||||||
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
onLoad() {
|
onLoad() {
|
||||||
|
@ -579,7 +581,8 @@
|
||||||
if (this.productList.length > 0) {
|
if (this.productList.length > 0) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.getGoods(false);
|
this.getGoods(false);
|
||||||
}, 1000)
|
this.getindex();
|
||||||
|
}, 10)
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
@ -1149,16 +1152,19 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
//获取订单列表
|
//获取订单列表
|
||||||
getGoods: function(isPage) {
|
getGoods: async function(isPage) {
|
||||||
let that = this;
|
let that = this;
|
||||||
if (that.loadend) return;
|
if (that.loadend) return;
|
||||||
if (that.loading) return;
|
if (that.loading) return;
|
||||||
|
|
||||||
if (isPage === true) that.$set(that, 'productList', []);
|
if (isPage === true) {
|
||||||
|
that.where.page = 1;
|
||||||
|
that.$set(that, 'productList', []);
|
||||||
|
}
|
||||||
|
|
||||||
that.loading = true;
|
that.loading = true;
|
||||||
that.loadTitle = '';
|
that.loadTitle = '';
|
||||||
getOrderList(that.where, this.userInfoData.service.mer_id).then(res => {
|
await getOrderList(that.where, this.userInfoData.service.mer_id).then(res => {
|
||||||
let list = res.data.list;
|
let list = res.data.list;
|
||||||
let productList = that.$util.SplitArray(list, that.productList);
|
let productList = that.$util.SplitArray(list, that.productList);
|
||||||
let loadend = list.length < that.where.limit;
|
let loadend = list.length < that.where.limit;
|
||||||
|
|
Loading…
Reference in New Issue