lilei il y a 2 ans
Parent
commit
2cd20d0624

+ 6 - 0
pages/latePlay/chooseProduct.vue

@@ -117,6 +117,12 @@
 			this.getpartList()
 			this.getShelfPlace()
 		},
+		onBackPress() {
+			if(this.showTab){
+				this.showTab = false
+				return true
+			}
+		},
 		// 批量打印
 		onNavigationBarButtonTap(e) {
 			if(this.queryWord=='' && this.placeTab.length>1){

+ 7 - 0
pages/shelfOrder/shelfOrder.vue

@@ -55,6 +55,13 @@
 			this.openModal = true
 			this.openShlefModal = false
 		},
+		onBackPress() {
+			if(this.openModal||this.openShlefModal){
+				this.openModal = false
+				this.openShlefModal = false
+				return true
+			}
+		},
 		onReady() {
 			const query = uni.createSelectorQuery().in(this);
 			query.select('#tjCons').boundingClientRect(data => {

+ 4 - 4
pages/shelfSetting/batchPrint.vue

@@ -37,9 +37,6 @@
 			}
 		},
 		onReady() {
-			uni.showLoading({
-				title: '正在加载...'
-			})
 			this.$refs.productList.setData(this.partList)
 			setTimeout(()=>{
 				uni.hideLoading()
@@ -48,11 +45,14 @@
 					this.allCheckeChange({value: true})
 					this.allChecked = true
 				}
-			},3000)
+			},Math.floor(this.partList.length * 15))
 		},
 		onLoad(option) {
 			this.basicInfoData = JSON.parse(decodeURIComponent(option.data));
 			this.partList = this.$store.state.vuex_tempPrintList
+			uni.showLoading({
+				title: '正在加载...'
+			})
 			// 保持屏幕常亮
 			uni.setKeepScreenOn({
 				keepScreenOn: true

+ 1 - 1
pages/shelfSetting/productList.vue

@@ -41,7 +41,7 @@
 					<view class="pcurnums flex align_center">
 						<text>打印数量</text>
 						<view class="u-ninput">
-							<u-number-box color="#000" :input-height="60" bg-color="#fff" v-model="item.printQty" :min="1"></u-number-box>
+							<u-number-box color="#000" :long-press="false" :input-height="60" bg-color="#fff" v-model="item.printQty" :min="1"></u-number-box>
 						</view>
 					</view>
 				</view>