Browse Source

bug 修复

lilei 2 years ago
parent
commit
c9b97c8ac1

+ 15 - 11
pages/batchShelves/cartList.vue

@@ -162,17 +162,20 @@
 				this.chooseModal = true
 			})
 		},
-		onBackPress() {
-			if(this.showLayer || this.showDelLay||this.chooseModal||this.showPrintModal){
-				this.showLayer = false
-				this.showDelLay = false
-				this.chooseModal = false
-				this.showPrintModal = false
-				return true
-			}
-			if(this.showPop){
-				this.showPop = false
-				return true
+		onBackPress(e) {
+			console.log(e)
+			if(e.from == "backbutton"){
+				if(this.showLayer || this.showDelLay||this.chooseModal||this.showPrintModal){
+					this.showLayer = false
+					this.showDelLay = false
+					this.chooseModal = false
+					this.showPrintModal = false
+					return true
+				}
+				if(this.showPop){
+					this.showPop = false
+					return true
+				}
 			}
 		},
 		onNavigationBarButtonTap(e) {
@@ -244,6 +247,7 @@
 					shelfSn: this.shelfSn,
 					...data
 				}).then(res => {
+					console.log(res)
 					uni.hideLoading()
 					if(res.status == 200){
 						uni.navigateBack()

+ 1 - 1
pages/shuntBackManage/addBackOrder.vue

@@ -146,7 +146,7 @@ export default {
 		})
 	},
 	onBackPress(e) {
-		if (this.sortShow) {
+		if (this.sortShow && e.from == "backbutton") {
 			this.chooseShow = false;
 			this.detailPopup = false;
 			return true;

+ 1 - 1
pages/shuntBackManage/chooseProduct.vue

@@ -164,7 +164,7 @@
 			}
 		},
 		onBackPress(e) {
-		  if(this.chooseShow || this.isDetailShow) {  
+		  if((this.chooseShow || this.isDetailShow) && e.from == "backbutton") {  
 			this.chooseShow = false;
 			this.isDetailShow= false
 			return true;