|
|
@@ -116,6 +116,14 @@
|
|
|
this.scrollHeight = windowHeight - 1;
|
|
|
},
|
|
|
getListFromServer(loadMore) {
|
|
|
+ this.$api.getStorage().then((resolve) =>{
|
|
|
+ this.userID = resolve.userID ? resolve.userID : '';
|
|
|
+ this.getQueryGoodslist(loadMore)
|
|
|
+ }).catch(resolve =>{
|
|
|
+ this.getQueryGoodslist(loadMore)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ getQueryGoodslist(loadMore){
|
|
|
let self = this;
|
|
|
const thisServerurl = self.$parent.serverUrl;
|
|
|
self.showLoading = true;
|
|
|
@@ -127,48 +135,44 @@
|
|
|
if(self.$parent.lastPageType === '再次购买') {
|
|
|
self.fromRegularPurchasePage = true;
|
|
|
}
|
|
|
- this.$api.getStorage().then((resolve) =>{
|
|
|
- this.userID = resolve.userID ? resolve.userID : '';
|
|
|
- queryGoodslist(thisServerurl,{userId:this.userID,pageNum:self.pageNum,pageSize:self.pageSize}).then(response=>{
|
|
|
- const resData = self.fromRegularPurchasePage ?response.data.page :response.data;
|
|
|
- const resList = resData.results,
|
|
|
- getCartNum = response.data.count;
|
|
|
- this.cartNum = getCartNum > 99 ?'99+' :getCartNum;
|
|
|
- if(!loadMore && self.fromRegularPurchasePage && resData.hasNextPage) {
|
|
|
- self.showRegularBtn = true;
|
|
|
+ queryGoodslist(thisServerurl,{userId:this.userID,pageNum:self.pageNum,pageSize:self.pageSize}).then(response=>{
|
|
|
+ const resData = self.fromRegularPurchasePage ?response.data.page :response.data;
|
|
|
+ const resList = resData.results,
|
|
|
+ getCartNum = response.data.count;
|
|
|
+ this.cartNum = getCartNum > 99 ?'99+' :getCartNum;
|
|
|
+ if(!loadMore && self.fromRegularPurchasePage && resData.hasNextPage) {
|
|
|
+ self.showRegularBtn = true;
|
|
|
+ }
|
|
|
+ if(resList && resList.length > 0){
|
|
|
+ self.hasNextPage = resData.hasNextPage;
|
|
|
+ self.totalPage = resData.totalPage;
|
|
|
+ if(loadMore) {
|
|
|
+ self.commodityList = [...self.commodityList,...resList];
|
|
|
+ self.showRegularBtn = false;
|
|
|
+ } else {
|
|
|
+ self.commodityList = [...resList];
|
|
|
+ self.showSkeleton = false;
|
|
|
}
|
|
|
- if(resList && resList.length > 0){
|
|
|
- self.hasNextPage = resData.hasNextPage;
|
|
|
- self.totalPage = resData.totalPage;
|
|
|
- if(loadMore) {
|
|
|
- self.commodityList = [...self.commodityList,...resList];
|
|
|
- self.showRegularBtn = false;
|
|
|
- } else {
|
|
|
- self.commodityList = [...resList];
|
|
|
- self.showSkeleton = false;
|
|
|
- }
|
|
|
- // 防上拉暴滑
|
|
|
- self.pullFlag = false;
|
|
|
- setTimeout(()=>{
|
|
|
- self.pullFlag = true;
|
|
|
- },500)
|
|
|
- // 底部提示文案
|
|
|
- if(self.hasNextPage) {
|
|
|
- self.loadingText = '上拉加载更多';
|
|
|
- } else {
|
|
|
- self.showLoading = true;
|
|
|
- self.loadingNow = false;
|
|
|
- }
|
|
|
+ // 防上拉暴滑
|
|
|
+ self.pullFlag = false;
|
|
|
+ setTimeout(()=>{
|
|
|
+ self.pullFlag = true;
|
|
|
+ },500)
|
|
|
+ // 底部提示文案
|
|
|
+ if(self.hasNextPage) {
|
|
|
+ self.loadingText = '上拉加载更多';
|
|
|
} else {
|
|
|
- if(!loadMore) {
|
|
|
- self.showEmpty = true;
|
|
|
- }
|
|
|
+ self.showLoading = true;
|
|
|
+ self.loadingNow = false;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if(!loadMore) {
|
|
|
+ self.showEmpty = true;
|
|
|
}
|
|
|
- }).catch(response =>{
|
|
|
- this.$util.msg(response.msg,2000);
|
|
|
- })
|
|
|
+ }
|
|
|
+ }).catch(response =>{
|
|
|
+ this.$util.msg(response.msg,2000);
|
|
|
})
|
|
|
-
|
|
|
},
|
|
|
operationHanld(prop){
|
|
|
this.$emit('operationConfim',prop)
|
