|
@@ -6,6 +6,7 @@ var orderPage = new Vue({
|
|
|
noMore: false,
|
|
|
listLoading: true,
|
|
|
isHandle:false,
|
|
|
+ isListEmpty:false,
|
|
|
isAllChecked:false,
|
|
|
isProductChecked:false,
|
|
|
checkedNum:0,
|
|
@@ -59,29 +60,32 @@ var orderPage = new Vue({
|
|
|
this.pageInput = 1;
|
|
|
}
|
|
|
},
|
|
|
- getCollectionProductList: function () {
|
|
|
+ getCollectionProductList: function () {// 获取收藏商品列表
|
|
|
var _self = this;
|
|
|
ProductApi.getProductUserLikeList(_self.listQuery,function (response) {
|
|
|
if (response.code === 0 ) {
|
|
|
var data = response.data;
|
|
|
_self.listRecord = data.totalRecord;
|
|
|
- var list = data.results.map((el,index)=>{
|
|
|
+ if(data.results.length > 0 ){
|
|
|
+ var list = data.results.map((el,index)=>{
|
|
|
el.isChecked = false;
|
|
|
- return el
|
|
|
- });
|
|
|
- if(isPC){
|
|
|
- _self.listData = list;
|
|
|
+ return el;
|
|
|
+ });
|
|
|
+ if(isPC){
|
|
|
+ _self.listData = list;
|
|
|
+ }else{
|
|
|
+ _self.listData = _self.listData.concat(list);
|
|
|
+ }
|
|
|
+ _self.isListEmpty = true;
|
|
|
}else{
|
|
|
- _self.listData = _self.listData.concat(list);
|
|
|
+ _self.listData = [];
|
|
|
+ _self.isListEmpty = false;
|
|
|
+ _self.noMore = false;
|
|
|
}
|
|
|
- setTimeout(function(){
|
|
|
- // 图片懒加载
|
|
|
- $("img[data-original]").lazyload();
|
|
|
- },500);
|
|
|
_self.listLoading = false;
|
|
|
_self.requestFlag = true;
|
|
|
}else {
|
|
|
- CAIMEI.Alert(res.msg, '确定');
|
|
|
+ CAIMEI.Alert(response.msg, '确定');
|
|
|
}
|
|
|
});
|
|
|
},
|
|
@@ -142,7 +146,7 @@ var orderPage = new Vue({
|
|
|
if(type == 1) {
|
|
|
_self.shoppingCart(pros);
|
|
|
}else{
|
|
|
- window.location.href = '/shopping/confirm.html?type=2&id='+pros.productId+'&count='+pros.priceGrade;
|
|
|
+ window.open('/shopping/confirm.html?type=2&id='+pros.productId+'&count='+pros.priceGrade);
|
|
|
}
|
|
|
},
|
|
|
hanldAllAddCart:function () {// 批量加入购物车
|
|
@@ -222,6 +226,7 @@ var orderPage = new Vue({
|
|
|
if(response.code == 0){
|
|
|
CAIMEI.dialog('取消收藏成功',true,function () {
|
|
|
_self.getCollectionProductList();
|
|
|
+ _self.isHandle = false;
|
|
|
});
|
|
|
}else{
|
|
|
CAIMEI.Alert(response.msg, '确定', false);
|
|
@@ -275,5 +280,29 @@ var orderPage = new Vue({
|
|
|
_self.listQuery.userId = this.userId;
|
|
|
_self.getCollectionProductList();
|
|
|
}
|
|
|
+ if(!isPC){
|
|
|
+ //移动端上垃加载更多
|
|
|
+ $(window).on('scroll', function(){
|
|
|
+ var scrollTop = $(this).scrollTop();
|
|
|
+ var scrollHeight = $(document).height();
|
|
|
+ var windowHeight = window.innerHeight;
|
|
|
+ if (scrollTop + windowHeight >= scrollHeight) {
|
|
|
+ //此处是滚动条到底部时候触发的事件,在这里写要加载的数据,或者是拉动滚动条的操作
|
|
|
+ var totalPage = Math.ceil(_self.listRecord / _self.listQuery.pageSize)?Math.ceil(_self.listRecord / _self.listQuery.pageSize):1;
|
|
|
+ var next = _self.listQuery.pageNum+1;
|
|
|
+ if(next <= totalPage){
|
|
|
+ if (_self.requestFlag){
|
|
|
+ _self.listQuery.pageNum = next;
|
|
|
+ // 获取列表数据
|
|
|
+ _self.getCollectionProductList();
|
|
|
+ }
|
|
|
+ _self.requestFlag = false;
|
|
|
+ }else{
|
|
|
+ //到底了
|
|
|
+ _self.noMore = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
});
|