|
@@ -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()
|