Browse Source

Merge branch 'CD_bugFix'

hbchen 2 years ago
parent
commit
09d3516af5
1 changed files with 3 additions and 11 deletions
  1. 3 11
      pages-sandTable/sandTable.vue

+ 3 - 11
pages-sandTable/sandTable.vue

@@ -244,16 +244,7 @@
 		},
 		onReachBottom() {
 			if(this.isRequseting) return 
-			if(this.list.length>=this.total && this.total!=0){
-				// if(this.haveShowToast) return
-				// // 只显示一次
-				// this.haveShowToast = true
-				// uni.showToast({
-				// 	title:"没有了~",
-				// 	icon:'none'
-				// })
-				return
-			}
+			if(this.list.length>=this.total && this.total!=0) return
 			this.sandTableQuery.curr_page++
 			this.getSandBoxList()
 		},
@@ -409,6 +400,7 @@
 							uni.navigateTo({url:'/pages-applyPermission/applyResult'})
 						})
 					}else{
+						this.haveGoToResult=true
 						uni.navigateTo({ url: '/pages-applyPermission/applyPermission?source=7&from_page=沙盘推演' })
 					}
 				}
@@ -479,7 +471,7 @@
 							current:index,
 							showmenu:false
 						})
-					},10)
+					},20)
 				})
 			},
 			// 生成海报