热门商品跳转更新

packageShang/pages/goods/goods-list.vue

@@ -54,7 +54,7 @@
 			</view>
 
 			<!-- 上拉加载更多 -->
-			<use-loadmore :type="loadmoreType"></use-loadmore>
+			<!-- <use-loadmore :type="loadmoreType"></use-loadmore> -->
 		</view>
 
 		<!-- 置顶 -->
@@ -73,13 +73,11 @@
 		goodslistlimit
 	} from '../../utils/api_home.js'
 	import useEmpty from '../../components/use-empty/use-empty.vue'
-	import useLoadmore from '../../components/use-loadmore/use-loadmore.vue'
 	import useTotop from '../../components/use-totop/use-totop.vue'
 	import useHotGoods from '../../components/use-hot-goods/use-hot-goods.vue'
 	export default {
 		components:{
 			useEmpty,
-			useLoadmore,
 			useTotop,
 			useHotGoods
 		},
@@ -219,12 +217,11 @@
 						return;
 					}
 					// 加载中
-					this.loadmoreType = 'loading';
+					// this.loadmoreType = 'loading';
 				} else {
 					// 更多
 					this.loadmoreType = 'more'
 				}
-				
 				if (this.pan==2){
 					//限时精选
 					let _self = this;
@@ -233,7 +230,7 @@
 					goodslistlimit(data).then((res) => {
 						if (res.success) {
 							var total=res.data.totalCount
-							data='?limited=1&state=1&pageSize='+total+'&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
+							data='?limited=1&state=1&pageSize='+total+'&curPage='+_self.reqdata.page+'&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
 							goodslistlimit(data).then((res) => {
 								if (res.success) {
 									res.data.list.forEach(data => {
@@ -253,7 +250,7 @@
 					goodslistlimit(data).then((res) => {
 						if (res.success) {
 							var total=res.data.totalCount
-							data='?hot=1&state=1&pageSize='+total+'&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
+							data='?hot=1&state=1&pageSize='+total+'&curPage='+_self.reqdata.page+'&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
 							goodslistlimit(data).then((res) => {
 								if (res.success) {
 									res.data.list.forEach(data => {
@@ -265,47 +262,49 @@
 							})
 						}
 					})
-				}
-				
-				let _self = this;
-				//根据类别
-				var data='?categoryId='+_self.leiId+'&state=1&categoryLevel='+_self.leiLevel
-					+'&curPage='+_self.reqdata.page+'&pageSize='+_self.reqdata.rows
-					+'&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
-				goodslistlimit(data).then((res) => {
-					if (res.success) {
-						if (res.data) {
-							if (loading == 1 || type == 'refresh') {
-								_self.goodsDatas = [];
-							}
-							let _datas = [];
-							res.data.list.forEach((row) => {
-								if(row.state === '1'){
-									_datas.push(row);
+				}else{
+					let _self = this;
+					//根据类别
+					var data='?categoryId='+_self.leiId+'&state=1&categoryLevel='+_self.leiLevel
+						+'&curPage='+_self.reqdata.page+'&pageSize='+_self.reqdata.rows
+						+'&orderField='+_self.reqdata.sidx+'&order='+_self.reqdata.sord
+					goodslistlimit(data).then((res) => {
+						if (res.success) {
+							if (res.data) {
+								if (loading == 1 || type == 'refresh') {
+									_self.goodsDatas = [];
+								}
+								let _datas = [];
+								res.data.list.forEach((row) => {
+									if(row.state === '1'){
+										_datas.push(row);
+									}
+								});
+								_self.goodsDatas = [..._self.goodsDatas, ..._datas];
+												
+								if (res.data.list.length >= _self.reqdata.rows) {
+									_self.reqdata.page++;
+									_self.loadmoreType = 'more'
+								} else {
+									_self.loadmoreType = 'nomore'
 								}
-							});
-							_self.goodsDatas = [..._self.goodsDatas, ..._datas];
-											
-							if (res.data.list.length >= _self.reqdata.rows) {
-								_self.reqdata.page++;
-								_self.loadmoreType = 'more'
 							} else {
 								_self.loadmoreType = 'nomore'
 							}
-						} else {
-							_self.loadmoreType = 'nomore'
 						}
-					}
-					if (_self.goodsDatas.length === 0) {
-						_self.empty = true;
-					}
-										
-					if (loading == 1) {
-						uni.hideLoading()
-					} else if (type == 'refresh') {
-						uni.stopPullDownRefresh();
-					}
-				})
+						if (_self.goodsDatas.length === 0) {
+							_self.empty = true;
+						}
+											
+						if (loading == 1) {
+							uni.hideLoading()
+						} else if (type == 'refresh') {
+							uni.stopPullDownRefresh();
+						}
+					})
+				}
+				
+				
 			},
 			// 点击筛选 
 			navbarClick(index) {