From ffdf06edadb1655d4b2163277219b92561b73111 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 20 十月 2023 14:41:35 +0800
Subject: [PATCH] #
---
pages/pakin/putOn.vue | 32 +++++++++++++++-
pages/tzsk/pakin/pakin2.vue | 2
pages/tzsk/AGV/AGVPick.vue | 2
pages/tzsk/AGV/AGVPakinOn.vue | 2
pages/order/orderPutDown.vue | 2
pages/tzsk/order/orderPutOn.vue | 2
pages/order/orderPakin.vue | 2
pages/order/orderPutOn.vue | 2
pages/tzsk/order/orderPick.vue | 2
pages/tzsk/AGV/AGVPakinBing.vue | 13 ++++--
pages/tzsk/AGV/AGVStart.vue | 2
pages/tzsk/AGV/AGVContainerMove.vue | 2
12 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/pages/order/orderPakin.vue b/pages/order/orderPakin.vue
index 6df10b6..ed713f7 100644
--- a/pages/order/orderPakin.vue
+++ b/pages/order/orderPakin.vue
@@ -455,7 +455,7 @@
box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
}
.list:first-child {
- margin-top: 410rpx;
+ margin-top: 280rpx;
}
.list:last-child {
margin-bottom: 120rpx;
diff --git a/pages/order/orderPutDown.vue b/pages/order/orderPutDown.vue
index b457e21..dcf2de6 100644
--- a/pages/order/orderPutDown.vue
+++ b/pages/order/orderPutDown.vue
@@ -473,7 +473,7 @@
box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
}
.list:first-child {
- margin-top: 410rpx;
+ margin-top: 280rpx;
}
.list:last-child {
margin-bottom: 120rpx;
diff --git a/pages/order/orderPutOn.vue b/pages/order/orderPutOn.vue
index 6df14c3..ba692e6 100644
--- a/pages/order/orderPutOn.vue
+++ b/pages/order/orderPutOn.vue
@@ -503,7 +503,7 @@
box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
}
.list:first-child {
- margin-top: 410rpx;
+ margin-top: 280rpx;
}
.list:last-child {
margin-bottom: 120rpx;
diff --git a/pages/pakin/putOn.vue b/pages/pakin/putOn.vue
index 66c6801..6e26c2a 100644
--- a/pages/pakin/putOn.vue
+++ b/pages/pakin/putOn.vue
@@ -141,6 +141,10 @@
<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
</uni-popup>
</view>
+
+ <view class="keyboard" :class="hidebg" mode="aspectFit" @click="hideKeyboard">
+ <image src="@/static/img/keyboard1.png" style="height: 70%;width: 70%;"></image>
+ </view>
</view>
</template>
@@ -169,14 +173,38 @@
barcodeFocus: true,
matFocus: false,
matData: '',
- removeNum: 0
+ removeNum: 0,
+ hide: true,
+ hidebg: 'kb-bgtr'
}
+ },
+ onLoad() {
+ // #ifdef APP
+ setInterval(()=>{
+ if (this.hide) {
+ uni.hideKeyboard()
+ } else {
+
+ }
+ },20)
+ // #endif
+ },
+ onBackPress() {
+ this.hide = false
},
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
},
methods: {
+ hideKeyboard() {
+ this.hide = this.hide ? false : true
+ if (this.hide) {
+ this.hidebg = 'kb-bgtr'
+ } else {
+ this.hidebg = 'kb-bgfa'
+ }
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -438,7 +466,7 @@
box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
}
.list:first-child {
- margin-top: 410rpx;
+ margin-top: 320rpx;
}
.list:last-child {
margin-bottom: 120rpx;
diff --git a/pages/tzsk/AGV/AGVContainerMove.vue b/pages/tzsk/AGV/AGVContainerMove.vue
index 224053c..1339b7b 100644
--- a/pages/tzsk/AGV/AGVContainerMove.vue
+++ b/pages/tzsk/AGV/AGVContainerMove.vue
@@ -551,7 +551,7 @@
color: #666666;
}
.list:first-child {
- margin-top: 360rpx;
+ margin-top: 320rpx;
}
.aside {
width: 100rpx;
diff --git a/pages/tzsk/AGV/AGVPakinBing.vue b/pages/tzsk/AGV/AGVPakinBing.vue
index d8af43d..d297192 100644
--- a/pages/tzsk/AGV/AGVPakinBing.vue
+++ b/pages/tzsk/AGV/AGVPakinBing.vue
@@ -17,9 +17,9 @@
</view>
</view>
</view>
- <!-- <view class="mat-list-title">
+ <view class="mat-list-title">
鍟嗗搧鍒楄〃
- </view> -->
+ </view>
<scroll-view>
<view class="list" v-for="(item,i) in dataList" :key="i">
<view class="list-left">
@@ -495,10 +495,13 @@
<style>
@import url('../../../static/css/wms.css/wms.css');
+ .list:first-child {
+ margin-top: 280rpx;
+ }
.code {
width: 100%;
position: fixed;
- min-height: 200rpx;
+ min-height: 140rpx;
background-color: #FFF;
z-index: 10;
}
@@ -506,7 +509,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -538,7 +541,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 200rpx;
+ margin-top: 140rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
diff --git a/pages/tzsk/AGV/AGVPakinOn.vue b/pages/tzsk/AGV/AGVPakinOn.vue
index e5075d9..c6eede5 100644
--- a/pages/tzsk/AGV/AGVPakinOn.vue
+++ b/pages/tzsk/AGV/AGVPakinOn.vue
@@ -673,7 +673,7 @@
<style>
@import url('../../../static/css/wms.css/wms.css');
.list:first-child {
- margin-top: 540rpx;
+ margin-top: 400rpx;
}
.code {
diff --git a/pages/tzsk/AGV/AGVPick.vue b/pages/tzsk/AGV/AGVPick.vue
index b21a541..7c0c509 100644
--- a/pages/tzsk/AGV/AGVPick.vue
+++ b/pages/tzsk/AGV/AGVPick.vue
@@ -565,7 +565,7 @@
color: #666666;
}
.list:first-child {
- margin-top: 360rpx;
+ margin-top: 320rpx;
}
.aside {
width: 100rpx;
diff --git a/pages/tzsk/AGV/AGVStart.vue b/pages/tzsk/AGV/AGVStart.vue
index da37dcf..4264c20 100644
--- a/pages/tzsk/AGV/AGVStart.vue
+++ b/pages/tzsk/AGV/AGVStart.vue
@@ -550,7 +550,7 @@
color: #666666;
}
.list:first-child {
- margin-top: 360rpx;
+ margin-top: 320rpx;
}
.aside {
width: 100rpx;
diff --git a/pages/tzsk/order/orderPick.vue b/pages/tzsk/order/orderPick.vue
index ed3b862..b4a3cd4 100644
--- a/pages/tzsk/order/orderPick.vue
+++ b/pages/tzsk/order/orderPick.vue
@@ -465,7 +465,7 @@
box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
}
.list:first-child {
- margin-top: 230rpx;
+ margin-top: 200rpx;
}
.list:last-child {
margin-bottom: 120rpx;
diff --git a/pages/tzsk/order/orderPutOn.vue b/pages/tzsk/order/orderPutOn.vue
index 74a5f94..e618127 100644
--- a/pages/tzsk/order/orderPutOn.vue
+++ b/pages/tzsk/order/orderPutOn.vue
@@ -465,7 +465,7 @@
box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
}
.list:first-child {
- margin-top: 410rpx;
+ margin-top: 280rpx;
}
.list:last-child {
margin-bottom: 120rpx;
diff --git a/pages/tzsk/pakin/pakin2.vue b/pages/tzsk/pakin/pakin2.vue
index b8d94e5..5d72753 100644
--- a/pages/tzsk/pakin/pakin2.vue
+++ b/pages/tzsk/pakin/pakin2.vue
@@ -566,7 +566,7 @@
@import url('../../../static/css/wms.css/wms.css');
.list:first-child {
- margin-top: 360rpx;
+ margin-top: 320rpx;
}
.code {
width: 100%;
--
Gitblit v1.9.1