加载中进度条取消 列表页跳转返回位置定位处理

index.html

@@ -36,10 +36,10 @@
 					<div class="bgImg" @click="nav('dw-list')">
 						<img src="image/dw-list.png" alt="" srcset="" />
 					</div>
-					<div class="bgImg" @click="nav('notice-list')">
+					<div class="bgImg" @click="nav('law-lv1')">
 						<img src="image/law-list.png" alt="" srcset="" />
 					</div>
-					<div class="bgImg" @click="nav('law-lv1')">
+					<div class="bgImg" @click="nav('notice-list')">
 						<img src="image/notice-list.png" alt="" srcset="" />
 					</div>
 					<div class="bgImg" @click="nav('emergency')">

sdk/http.js

@@ -38,7 +38,7 @@ var http2 = {
 		
 		// vaildInterfacefn("gqyjglptxiefn", params.serviceId, data, "1", "https://" + urldomaincreatesign, "https://" + urldomaingateway).then((value) => {
 		vaildInterfacefn("gqyjglptxiefn", params.serviceId, data, "1", extraData).then((value) => {
-			console.log('vaildInterfacefn响应', value)
+			// console.log('vaildInterfacefn响应', value)
 			/**
 			 * code: 200
 			   data: "048b04671ad85e52e" // value 值就是接口返回的data值
@@ -59,7 +59,7 @@ var http2 = {
 			let sm2_encrypt_result = value // 后台返回待解密内容
 			let sm2_decrypt_result = sm2_Decrypt(sm2_encrypt_result, params.interfacePrivateKey)
 			
-			// console.log('vaildInterfacefn响应解密', sm2_decrypt_result)
+			console.log('vaildInterfacefn响应解密', sm2_decrypt_result)
 			const decryptRes = JSON.parse(sm2_decrypt_result)
 			if(decryptRes.code === 400 || decryptRes.code === 401 || decryptRes.status === 401){
 				vant.Dialog.alert({

sdk/jssdk2/index.js

 const appword = "aKd20dbGdFvmuwrt" // 固定值
 
 window.onload = function() {
-	vant.Toast.loading({
-		message: '加载中...',
-		forbidClick: true,
-		loadingType: 'spinner',
-	});
+	// vant.Toast.loading({
+	// 	message: '加载中...',
+	// 	forbidClick: true,
+	// 	loadingType: 'spinner',
+	// });
 	// if(!localStorage.getItem('token')){
 	if(!gemhoUtil.getCookie('token')){
 		getUserInfo()

sdk/util.js

@@ -203,6 +203,15 @@ gemhoUtil.navigatePage = function(path, title) {
 	} else {
 		url += path + '?rev=' + (+new Date())
 	}
+	
+	  // 保存当前的滚动位置
+	var scrollPosition = window.scrollY;
+
+	// 利用 pushState 在浏览器历史记录中添加新状态
+	// history.pushState({ scrollPosition: scrollPosition }, '');
+	console.log('跳转页面', scrollPosition)
+	gemhoUtil.setCookie('scrollPosition', scrollPosition)
+	
 	location.href = url;
 }
 

src/dw-list.js

@@ -13,7 +13,7 @@ window.addEventListener("load", function() {
 				loading: false,
 				finished: false,
 				page: 0,
-				size: 10,
+				size: 9999,
 				total: 0
 			}
 		},
@@ -34,10 +34,6 @@ window.addEventListener("load", function() {
 				gemhoUtil.navigatePage('./dw-list-detail.html?dwId='+item.id+'&type=edit')
 			},
 			getList(){
-				// if(this.loading){
-				// 	return
-				// }
-				// this.loading = true
 				setTimeout(() => {
 					http2.post({
 						serviceId: API_KEY_MAP["dw-list"]['id'],
@@ -51,7 +47,7 @@ window.addEventListener("load", function() {
 					}, (res) => {
 							
 						if(res){
-							console.log('接口回调数据', JSON.parse(res))
+							// console.log('接口回调数据', JSON.parse(res))
 							
 							var result = JSON.parse(res)
 							this.loading = false; // 加载状态结束
@@ -63,6 +59,10 @@ window.addEventListener("load", function() {
 							}
 						}
 						this.loading = false
+						this.$nextTick(()=>{
+							// 滚动条跳转位置
+							window.scrollTo(0, gemhoUtil.getCookie('scrollPosition'));
+						})
 					})
 				}, 0)
 			}

src/emergency.js

@@ -12,7 +12,7 @@ window.addEventListener("load", function() {
 				loading: false,
 				finished: false,
 				page: 0,
-				size: 10,
+				size: 9999,
 				total: 0
 			}
 		},
@@ -25,7 +25,7 @@ window.addEventListener("load", function() {
 			},
 			resetSearchForm() {
 				this.page = 0
-				this.size = 20
+				this.size = 9999
 				this.total = 0
 				this.list = []
 				this.finished = false;
@@ -40,10 +40,6 @@ window.addEventListener("load", function() {
 				this.getList()
 			},
 			getList() {
-				// if(this.loading){
-				// 	return
-				// }
-				// this.loading = true
 				setTimeout(() => {
 					http2.post({
 						serviceId: API_KEY_MAP["emergency"]['id'],
@@ -61,7 +57,7 @@ window.addEventListener("load", function() {
 					}, (res) => {
 
 						if (res) {
-							console.log('接口回调数据', JSON.parse(res))
+							// console.log('接口回调数据', JSON.parse(res))
 
 							var result = JSON.parse(res).body
 							this.loading = false; // 加载状态结束
@@ -73,6 +69,10 @@ window.addEventListener("load", function() {
 							}
 						}
 						this.loading = false
+						this.$nextTick(()=>{
+							// 滚动条跳转位置
+							window.scrollTo(0, gemhoUtil.getCookie('scrollPosition'));
+						})
 					})
 				}, 0)
 			}

src/law-list.js

@@ -13,7 +13,7 @@ window.addEventListener("load", function() {
 				loading: false,
 				finished: false,
 				page: 0,
-				size: 10,
+				size: 9999,
 				total: 0
 			}
 		},
@@ -22,18 +22,10 @@ window.addEventListener("load", function() {
 		},
 		methods: {
 			detail(index) {
-				// this.list[index].currentUserRead = true
-				// location.href = './law-list-detail.html?law_id='+this.list[index].lawId
 				gemhoUtil.navigatePage('./law-list-detail.html?law_id=' + this.list[index].lawId)
 			},
 			getList() {
-				// if(this.loading){
-				// 	return
-				// }
-				// this.loading = true
 				setTimeout(() => {
-
-
 					http2.post({
 						serviceId: API_KEY_MAP["law-list"]['id'],
 						interfacePublicKey: API_KEY_MAP["law-list"]["publicKey"],
@@ -47,7 +39,7 @@ window.addEventListener("load", function() {
 					}, (res) => {
 
 						if (res) {
-							console.log('接口回调数据', JSON.parse(res))
+							// console.log('接口回调数据', JSON.parse(res))
 
 							var result = JSON.parse(res)
 							this.list.push(...result.content);
@@ -58,6 +50,10 @@ window.addEventListener("load", function() {
 							}
 						}
 						this.loading = false
+						this.$nextTick(()=>{
+							// 滚动条跳转位置
+							window.scrollTo(0, gemhoUtil.getCookie('scrollPosition'));
+						})
 					})
 				}, 0)
 			}

src/law-lv1.js

@@ -13,7 +13,7 @@ window.addEventListener("load", function() {
 				loading: false,
 				finished: false,
 				page: 0,
-				size: 20,
+				size: 9999,
 				total: 0
 			}
 		},
@@ -26,13 +26,7 @@ window.addEventListener("load", function() {
 				gemhoUtil.navigatePage('./law-lv2.html?pid=' + item.id)
 			},
 			getList() {
-				// if(this.loading){
-				// 	return
-				// }
-				// this.loading = true
 				setTimeout(() => {
-
-
 					http2.post({
 						serviceId: API_KEY_MAP["law-lv"]['id'],
 						interfacePublicKey: API_KEY_MAP["law-lv"]["publicKey"],
@@ -45,7 +39,7 @@ window.addEventListener("load", function() {
 					}, (res) => {
 
 						if (res) {
-							console.log('接口回调数据', JSON.parse(res))
+							// console.log('接口回调数据', JSON.parse(res))
 
 							var result = JSON.parse(res)
 							this.loading = false; // 加载状态结束
@@ -57,6 +51,10 @@ window.addEventListener("load", function() {
 							}
 						}
 						this.loading = false
+						this.$nextTick(()=>{
+							// 滚动条跳转位置
+							window.scrollTo(0, gemhoUtil.getCookie('scrollPosition'));
+						})
 					})
 				}, 0)
 			}

src/law-lv2.js

@@ -11,7 +11,7 @@ window.addEventListener("load", function() {
 				loading: false,
 				finished: false,
 				page: 0,
-				size: 20,
+				size: 9999,
 				total: 0
 			}
 		},
@@ -25,13 +25,7 @@ window.addEventListener("load", function() {
 				gemhoUtil.navigatePage('./law-list.html?category_id=' + category_id)
 			},
 			getList() {
-				// if(this.loading){
-				// 	return
-				// }
-				// this.loading = true
 				setTimeout(() => {
-
-
 					http2.post({
 						serviceId: API_KEY_MAP["law-lv"]['id'],
 						interfacePublicKey: API_KEY_MAP["law-lv"]["publicKey"],
@@ -45,7 +39,7 @@ window.addEventListener("load", function() {
 					}, (res) => {
 
 						if (res) {
-							console.log('接口回调数据', JSON.parse(res))
+							// console.log('接口回调数据', JSON.parse(res))
 
 							var result = JSON.parse(res)
 							this.loading = false; // 加载状态结束
@@ -60,6 +54,10 @@ window.addEventListener("load", function() {
 							}
 						}
 						this.loading = false
+						this.$nextTick(()=>{
+							// 滚动条跳转位置
+							window.scrollTo(0, gemhoUtil.getCookie('scrollPosition'));
+						})
 					})
 				}, 0)
 			}

src/notice-list.js

@@ -11,12 +11,14 @@ window.addEventListener("load", function() {
 				loading: false,
 				finished: false,
 				page: 0,
-				size: 10,
+				size: 9999,
 				total: 0
 			}
 		},
 		mounted() {
 			this.getList()
+		
+		
 		},
 		methods: {
 			detail(index) {
@@ -25,13 +27,7 @@ window.addEventListener("load", function() {
 					.noticeId)
 			},
 			getList() {
-				// if(this.loading){
-				// 	return
-				// }
-				// this.loading = true
 				setTimeout(() => {
-
-
 					http2.post({
 						serviceId: API_KEY_MAP["notice-list"]['id'],
 						interfacePublicKey: API_KEY_MAP["notice-list"]["publicKey"],
@@ -44,7 +40,7 @@ window.addEventListener("load", function() {
 					}, (res) => {
 
 						if (res) {
-							console.log('接口回调数据', JSON.parse(res))
+							// console.log('接口回调数据', JSON.parse(res))
 
 							var result = JSON.parse(res)
 							this.loading = false; // 加载状态结束
@@ -56,6 +52,10 @@ window.addEventListener("load", function() {
 							}
 						}
 						this.loading = false
+						this.$nextTick(()=>{
+							// 滚动条跳转位置
+							window.scrollTo(0, gemhoUtil.getCookie('scrollPosition'));
+						})
 					})
 				}, 0)
 			}

src/yh-list.js

@@ -13,21 +13,13 @@ window.addEventListener("load", function() {
 				// loadFlag: false,
 				finished: false,
 				page: 0,
-				size: 10,
+				size: 9999,
 				total: 0
 			}
 		},
 		mounted() {
 			this.getList()
 		},
-		watch: {
-			loadFlag: {
-				handler(newValue, oldValue) {
-					console.log('loadFlag111变化了', oldValue, newValue);
-				},
-				immediate: true // 立即执行监听器
-			}
-		},
 		methods: {
 			detail(item) {
 				gemhoUtil.navigatePage('./yh-list-detail.html?hdId=' + item.hdId + '&type=detail')
@@ -36,12 +28,6 @@ window.addEventListener("load", function() {
 				gemhoUtil.navigatePage('./yh-list-detail.html?hdId=' + item.hdId + '&type=edit')
 			},
 			getList() {
-				console.log('this.loadFlag', this.loadFlag)
-				// if (this.loadFlag) {
-				// 	return
-				// }
-				// this.loadFlag = true
-
 				setTimeout(() => {
 					http2.post({
 						serviceId: API_KEY_MAP["yh-list"]['id'],
@@ -63,7 +49,11 @@ window.addEventListener("load", function() {
 							}
 						}
 						this.loadFlag = false
-						console.log('响应结束',this.total, this.list.length)
+						// console.log('响应结束',this.total, this.list.length)
+						this.$nextTick(()=>{
+							// 滚动条跳转位置
+							window.scrollTo(0, gemhoUtil.getCookie('scrollPosition'));
+						})
 					})
 				}, 0)