From d918c3653d6505df799e91073d724210a8f9138e Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Tue, 31 Oct 2023 11:12:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/mes/Pallethandling/index.vue | 14 ++++++++++++--
 src/pages/shouye/me.vue                | 10 ++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/pages/mes/Pallethandling/index.vue b/src/pages/mes/Pallethandling/index.vue
index 9aee27d..ad4ac92 100644
--- a/src/pages/mes/Pallethandling/index.vue
+++ b/src/pages/mes/Pallethandling/index.vue
@@ -122,7 +122,10 @@ export default class ChangePalletNew extends BasePage {
   locationStatus: any = 1;
   async query() {
     if (this.orderNo == '' || this.orderNo.length == 0) {
-      this.customToast('请输入nficl');
+      (this.$refs.uToast as any).show({
+        title: '请输入nficl',
+        type: 'default',
+      });
       return;
     }
     await this.model.queryOrderNo(this.orderNo);
@@ -134,6 +137,13 @@ export default class ChangePalletNew extends BasePage {
       });
     } else {
       this.orderNoItemList = model.orderNoItemList;
+      if (this.orderNoItemList.productCode == 'EmptyPallet') {
+        (this.$refs.uToast as any).show({
+          title: '请绑定',
+          type: 'default',
+        });
+        return;
+      }
     }
     //console.log('this.orderNoItemList', this.orderNoItemList);
   }
@@ -276,7 +286,7 @@ export default class ChangePalletNew extends BasePage {
   onbind() {
     if (this.orderNo == '' || this.orderNo.length == 0) {
       (this.$refs.uToast as any).show({
-        title: '请扫码正确条码',
+        title: '请输入nficl',
         type: 'default',
       });
       return;
diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index 7d4e45a..2101343 100644
--- a/src/pages/shouye/me.vue
+++ b/src/pages/shouye/me.vue
@@ -33,8 +33,9 @@
         </view>
       </view>
     </view>
-    <view class="astyle">
+    <view class="astyle astyleversion">
       <view @click="checkupdate()"> 检查更新 </view>
+      <view @click="checkupdate()"> Version:{{ version }} </view>
       <!-- <u-button
         @click.native="
           uni.navigateTo({
@@ -64,10 +65,11 @@ export default class RawHome extends BasePage {
   model = model;
   src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
   today = dayjs().format('YYYY-MM-DD dddd');
-  version = '0.0.3';
+  version = '0.0.4';
   checkversion: any = {};
   onLoad() {
     // this.model.getMenuList();
+    uni.setStorageSync('version', this.version);
   }
   compareVersion(version1: any, version2: any) {
     //如果version1 大 会返回1  &&&  如果version2 大 会返回 -1
@@ -243,4 +245,8 @@ export default class RawHome extends BasePage {
     border-radius: 8rpx;
   }
 }
+.astyleversion {
+  display: flex;
+  justify-content: space-between;
+}
 </style>