Merge branch 'master' of http://101.37.147.115:3000/mz666/apply-assistant-v3

pages/home/index.vue

@@ -259,7 +259,7 @@ export default {
 				size: 50,
 				list: [],
 				isFinish: -1,
-				sortTag: 2,
+				sortTag: 0,
 			},
 			keyword: "",
 			tabInfo: {
@@ -419,12 +419,14 @@ export default {
 				.select("#tttop")
 				.boundingClientRect((data) => {
 					console.log("data", data);
-					if (data.top <= 0) {
-						that.toTop = true;
-						that.showToTop = true;
-					} else {
-						that.toTop = false;
-						that.showToTop = false;
+					if(data){
+						if (data.top <= 0) {
+							that.toTop = true;
+							that.showToTop = true;
+						} else {
+							that.toTop = false;
+							that.showToTop = false;
+						}
 					}
 					// domTopInfo.value[id] = data.top;
 					// scrollTop.value = data.top - 200;
@@ -443,9 +445,7 @@ export default {
 		reachBottom() {
 			let that = this;
 			console.log("onReachBottom", that.query.isFinish);
-			this.G.isLogin();
-			if (this.G.isLogin()) {
-				console.log("that.query.size", that.query.size);
+			if(uni.getStorageSync("apply-token")){
 				if (that.query.isFinish == -1 || that.query.isFinish == that.query.size) {
 					that.query.page++;
 					that.getList("concat");