合并

unpackage/dist/dev/mp-weixin/app.js

@@ -21,7 +21,6 @@ if (!Math) {
   "./pagesHome/pages/RelayScanList/RelayScanList.js";
   "./pagesHome/pages/codePlateBracket/codePlateBracket.js";
   "./pagesHome/pages/ArrivalList/ArrivalList.js";
-  "./pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.js";
   "./pagesHome/pages/SelfPickupScan/SelfPickupScan.js";
   "./pagesHome/pages/LoadingScan/LoadingScan.js";
   "./pagesHome/pages/loadingRetention/loadingRetention.js";
@@ -59,7 +58,6 @@ if (!Math) {
   "./pagesHome/pages/Relocation/Relocation.js";
   "./pagesHome/pages/PeopleScanUpType/PeopleScanUpType.js";
   "./pagesHome/pages/PeopleScanUp/PeopleScanUp.js";
-  "./pagesHome/pages/PickingScanList/PickingScanList.js";
   "./pagesHome/pages/Retention/Retention.js";
   "./pagesHome/pages/MergeTray/MergeTray.js";
   "./pagesHome/pages/MergeTrayDetails/MergeTrayDetails.js";

unpackage/dist/dev/mp-weixin/app.json

@@ -70,7 +70,8 @@
         "pages/orderDetails/orderDetails",
         "pages/orderInquiry/orderInquiry",
         "pages/CustomerTrayDetails/CustomerTrayDetails",
-        "pages/StockUpListZero/StockUpListZero"
+        "pages/StockUpListZero/StockUpListZero",
+        "pages/SearchTray/SearchTray"
       ]
     },
     {

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1260,8 +1260,8 @@ function populateParameters(fromRes, toRes) {
   const parameters = {
     appId: "__UNI__EB22F37",
     appName: "货无忧",
-    appVersion: "1.0.37",
+    appVersion: "1.0.32",
-    appVersionCode: 1037,
+    appVersionCode: 1032,
     appLanguage: getAppLanguage(hostLanguage),
     uniCompileVersion: "3.95",
     uniRuntimeVersion: "3.95",
@@ -1404,8 +1404,8 @@ const getAppBaseInfo = {
       hostTheme: theme,
       appId: "__UNI__EB22F37",
       appName: "货无忧",
-      appVersion: "1.0.37",
+      appVersion: "1.0.32",
-      appVersionCode: 1037,
+      appVersionCode: 1032,
       appLanguage: getAppLanguage(hostLanguage)
     }));
   }

unpackage/dist/dev/mp-weixin/compoment/saomiao2.js

@@ -1,5 +1,6 @@
 "use strict";
 const common_vendor = require("../common/vendor.js");
+require("../utils/log.js");
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "saomiao2",
   props: {
@@ -13,6 +14,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       intentFilter: null,
       isstart: false
     });
+    common_vendor.reactive([]);
     common_vendor.onLoad(async () => {
       console.log("扫描的--------------onLoad");
     });

unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.js

@@ -386,12 +386,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         ai: common_vendor.o(($event) => checkbox(2)),
         aj: common_vendor.o(() => {
         }),
-        ak: common_vendor.o(($event) => checkbox(0))
+        ak: common_vendor.o(() => {
+        }),
+        al: common_vendor.o(($event) => checkbox(0))
       }) : {}, {
-        al: common_vendor.unref(showPreviewPicture)
+        am: common_vendor.unref(showPreviewPicture)
       }, common_vendor.unref(showPreviewPicture) ? {
-        am: common_vendor.unref(details).previewPictureUrl,
+        an: common_vendor.unref(details).previewPictureUrl,
-        an: common_vendor.o(($event) => handleShowImage())
+        ao: common_vendor.o(($event) => handleShowImage())
       } : {});
     };
   }

unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxml

@@ -1 +1 @@
-<view wx:if="{{a}}" class="maboxbg" bindtap="{{ak}}"><scroll-view class="modtips" catchtap="{{aj}}"><view class="title">{{b}}</view><block wx:if="{{c}}"><view class="inputbx"><input placeholder="{{d}}" value="{{e}}" bindinput="{{f}}"/></view></block><block wx:elif="{{g}}"><view wx:if="{{h}}" class="selviebx"><view wx:if="{{i}}" bindtap="{{j}}">全选</view><view wx:else bindtap="{{k}}">全不选</view></view><view class="listcheck"><view wx:for="{{l}}" wx:for-item="item" bindtap="{{item.c}}"><image src="{{item.a}}"></image><view>{{item.b}}</view></view></view></block><block wx:elif="{{m}}"><scroll-view scroll-y="true" class="scvboxs"><view wx:for="{{n}}" wx:for-item="item" wx:key="i"><view style="display:flex;justify-content:space-between;align-items:center"><text class="{{['tpstitl', item.b && 'start', item.c && 'showTitle']}}">{{item.a}}</text><block wx:if="{{item.d}}"><text bindtap="{{item.e}}" class="showImageBtn">预览模版</text></block></view><view class="imgbx"><view wx:for="{{item.f}}" wx:for-item="value"><image src="{{value.a}}" bindtap="{{value.b}}"></image><image bindtap="{{value.c}}" src="{{o}}"></image></view><view wx:if="{{item.g}}" bindtap="{{item.h}}"><image src="/static/add.png"></image></view></view></view></scroll-view><view class="inputbx"><input placeholder="{{p}}" value="{{q}}" bindinput="{{r}}"/></view></block><block wx:elif="{{s}}"><scroll-view scroll-y="true" class="scvboxs"><view wx:for="{{t}}" wx:for-item="item" class="inpNumList" bindtap="{{item.j}}"><view class="inpNum-title"> 物料名称: {{item.a}}</view><view class="inpNum-title"> 物料总数: {{item.b}}</view><view class="inpNum-value"><view class=""> 物料数量:  </view><input wx:if="{{item.c}}" class="inpNum" placeholder="{{item.d}}" disabled="{{item.e}}" type="number" bindinput="{{item.f}}" value="{{item.g}}"/><text wx:elif="{{item.h}}" style="flex:1">{{item.i}}</text></view></view></scroll-view></block><block wx:elif="{{v}}"><scroll-view scroll-y="true" class="scvboxs"><block wx:if="{{w}}"><view class="inputbx"><input placeholder="请输入合同号" value="{{x}}" bindinput="{{y}}"/></view><view class="inputbx"><input placeholder="请输入或扫描包条码" value="{{z}}" bindinput="{{A}}"/></view></block><block wx:if="{{B}}"><view class="inputbx"><input placeholder="请输入订单号" value="{{C}}" bindinput="{{D}}"/></view><view class="inputbx"><input placeholder="请输入或扫描包条码" value="{{E}}" bindinput="{{F}}"/></view></block><block wx:if="{{G}}"><view class="inputbx"><input placeholder="请输入合同号" value="{{H}}" bindinput="{{I}}"/></view><view class="inputbx"><input placeholder="请输入批次号" value="{{J}}" bindinput="{{K}}"/></view><view class="inputbx"><input bindinput="{{L}}" placeholder="请输入物料编码或物料名称" value="{{M}}"/><view class="select_content"><block wx:if="{{N}}"><view wx:for="{{O}}" wx:for-item="val" wx:key="c" bindtap="{{val.b}}">{{val.a}}</view></block></view></view><view class="inputbx" bindtouchstart="{{U}}"><input placeholder="请选择商城" disabled="true" value="{{P}}" bindinput="{{Q}}"/><block wx:if="{{R}}"><view class="{{['select_content', T && 'show']}}"><view wx:for="{{S}}" wx:for-item="val" wx:key="b" bindtap="{{val.c}}">{{val.a}}</view></view></block></view><view class="inputbx"><input placeholder="请输入在库数量" value="{{V}}" bindinput="{{W}}"/></view></block></scroll-view></block><block wx:elif="{{X}}"><scroll-view scroll-y="true" class="scvboxs"><view wx:if="{{Y}}" class="selviebx"><view wx:if="{{Z}}" bindtap="{{aa}}">全选</view><view wx:else bindtap="{{ab}}">反选</view></view><view class="listcheck"><view><image src="/static/check1.png"></image><view style="width:60px">在库</view> {{ac}}</view><view wx:for="{{ad}}" wx:for-item="item"><image bindtap="{{item.a}}" style="flex:none" src="{{item.b}}"></image><view style="flex:none;width:60px">{{item.c}}</view><input type="number" style="border:1px solid #000" bindinput="{{item.d}}" disabled="{{item.e}}" value="{{item.f}}"/></view></view></scroll-view></block><view class="buts"><view wx:if="{{ae}}" bindtap="{{ag}}" class="cancel">{{af}}</view><view bindtap="{{ai}}" class="confirm">{{ah}}</view></view></scroll-view></view><view wx:if="{{al}}" class="previewPicture-container" catchtap="{{an}}"><image src="{{am}}" class="previewPicture" alt=""></image></view>
+<view wx:if="{{a}}" class="maboxbg" catchtouchmove="{{ak}}" bindtap="{{al}}"><scroll-view class="modtips" catchtap="{{aj}}"><view class="title">{{b}}</view><block wx:if="{{c}}"><view class="inputbx"><input placeholder="{{d}}" value="{{e}}" bindinput="{{f}}"/></view></block><block wx:elif="{{g}}"><view wx:if="{{h}}" class="selviebx"><view wx:if="{{i}}" bindtap="{{j}}">全选</view><view wx:else bindtap="{{k}}">全不选</view></view><view class="listcheck"><view wx:for="{{l}}" wx:for-item="item" bindtap="{{item.c}}"><image src="{{item.a}}"></image><view>{{item.b}}</view></view></view></block><block wx:elif="{{m}}"><scroll-view scroll-y="true" class="scvboxs"><view wx:for="{{n}}" wx:for-item="item" wx:key="i"><view style="display:flex;justify-content:space-between;align-items:center"><text class="{{['tpstitl', item.b && 'start', item.c && 'showTitle']}}">{{item.a}}</text><block wx:if="{{item.d}}"><text bindtap="{{item.e}}" class="showImageBtn">预览模版</text></block></view><view class="imgbx"><view wx:for="{{item.f}}" wx:for-item="value"><image src="{{value.a}}" bindtap="{{value.b}}"></image><image bindtap="{{value.c}}" src="{{o}}"></image></view><view wx:if="{{item.g}}" bindtap="{{item.h}}"><image src="/static/add.png"></image></view></view></view></scroll-view><view class="inputbx"><input placeholder="{{p}}" value="{{q}}" bindinput="{{r}}"/></view></block><block wx:elif="{{s}}"><scroll-view scroll-y="true" class="scvboxs"><view wx:for="{{t}}" wx:for-item="item" class="inpNumList" bindtap="{{item.j}}"><view class="inpNum-title"> 物料名称: {{item.a}}</view><view class="inpNum-title"> 物料总数: {{item.b}}</view><view class="inpNum-value"><view class=""> 物料数量:  </view><input wx:if="{{item.c}}" class="inpNum" placeholder="{{item.d}}" disabled="{{item.e}}" type="number" bindinput="{{item.f}}" value="{{item.g}}"/><text wx:elif="{{item.h}}" style="flex:1">{{item.i}}</text></view></view></scroll-view></block><block wx:elif="{{v}}"><scroll-view scroll-y="true" class="scvboxs"><block wx:if="{{w}}"><view class="inputbx"><input placeholder="请输入合同号" value="{{x}}" bindinput="{{y}}"/></view><view class="inputbx"><input placeholder="请输入或扫描包条码" value="{{z}}" bindinput="{{A}}"/></view></block><block wx:if="{{B}}"><view class="inputbx"><input placeholder="请输入订单号" value="{{C}}" bindinput="{{D}}"/></view><view class="inputbx"><input placeholder="请输入或扫描包条码" value="{{E}}" bindinput="{{F}}"/></view></block><block wx:if="{{G}}"><view class="inputbx"><input placeholder="请输入合同号" value="{{H}}" bindinput="{{I}}"/></view><view class="inputbx"><input placeholder="请输入批次号" value="{{J}}" bindinput="{{K}}"/></view><view class="inputbx"><input bindinput="{{L}}" placeholder="请输入物料编码或物料名称" value="{{M}}"/><view class="select_content"><block wx:if="{{N}}"><view wx:for="{{O}}" wx:for-item="val" wx:key="c" bindtap="{{val.b}}">{{val.a}}</view></block></view></view><view class="inputbx" bindtouchstart="{{U}}"><input placeholder="请选择商城" disabled="true" value="{{P}}" bindinput="{{Q}}"/><block wx:if="{{R}}"><view class="{{['select_content', T && 'show']}}"><view wx:for="{{S}}" wx:for-item="val" wx:key="b" bindtap="{{val.c}}">{{val.a}}</view></view></block></view><view class="inputbx"><input placeholder="请输入在库数量" value="{{V}}" bindinput="{{W}}"/></view></block></scroll-view></block><block wx:elif="{{X}}"><scroll-view scroll-y="true" class="scvboxs"><view wx:if="{{Y}}" class="selviebx"><view wx:if="{{Z}}" bindtap="{{aa}}">全选</view><view wx:else bindtap="{{ab}}">反选</view></view><view class="listcheck"><view><image src="/static/check1.png"></image><view style="width:60px">在库</view> {{ac}}</view><view wx:for="{{ad}}" wx:for-item="item"><image bindtap="{{item.a}}" style="flex:none" src="{{item.b}}"></image><view style="flex:none;width:60px">{{item.c}}</view><input type="number" style="border:1px solid #000" bindinput="{{item.d}}" disabled="{{item.e}}" value="{{item.f}}"/></view></view></scroll-view></block><view class="buts"><view wx:if="{{ae}}" bindtap="{{ag}}" class="cancel">{{af}}</view><view bindtap="{{ai}}" class="confirm">{{ah}}</view></view></scroll-view></view><view wx:if="{{am}}" class="previewPicture-container" catchtap="{{ao}}"><image src="{{an}}" class="previewPicture" alt=""></image></view>

unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxss

@@ -175,7 +175,7 @@
 }
 .modtips .listcheck {
   display: flex;
-  height: 50vh;
+  max-height: 50vh;
   overflow-y: scroll;
   flex-direction: column;
   margin-top: 30rpx;
@@ -184,10 +184,8 @@
   width: 420rpx;
   display: flex;
   align-items: center;
-  justify-content: flex-start;
   font-size: 28rpx;
-  padding: 10rpx 0;
+  padding: 20rpx 0;
-  margin: 10rpx 0;
 }
 .modtips .listcheck > view > image {
   width: 30rpx;

unpackage/dist/dev/mp-weixin/config/host.js

@@ -1,5 +1,5 @@
 "use strict";
-const devhost = "http://192.168.6.122:8777/";
+const devhost = "http://192.168.10.25:13000/";
 const imghost = "";
 const host = devhost;
 const APPKEY = "h5u:h5u_secret";

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -2,6 +2,7 @@
 const common_vendor = require("../../common/vendor.js");
 const api_user = require("../../api/user.js");
 const utils_cacheimg = require("../../utils/cacheimg.js");
+const store_useStorageStore = require("../../store/useStorageStore.js");
 require("../../utils/request.js");
 require("../../store/index.js");
 require("../../utils/functions.js");
@@ -21,6 +22,9 @@ if (!Math) {
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
+    const storageStore = store_useStorageStore.useStorageStore();
+    const { HANDLE_GETSTORAGEINFO } = storageStore;
+    const { storageArr } = common_vendor.storeToRefs(storageStore);
     const tip = common_vendor.ref(null);
     let details = common_vendor.reactive({ tablist: [] });
     function gopathpage(path) {
@@ -64,14 +68,17 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     }
     common_vendor.onShow(() => {
       init();
+      initbuts();
+      if (storageArr.value.length === 0)
+        HANDLE_GETSTORAGEINFO();
     });
     common_vendor.onLoad(() => {
-      initbuts();
     });
     common_vendor.onPullDownRefresh(() => {
       const timer = setTimeout(() => {
         init();
         initbuts();
+        HANDLE_GETSTORAGEINFO();
         common_vendor.index.stopPullDownRefresh();
         clearTimeout(timer);
       }, 500);

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -4,6 +4,7 @@ const api_user = require("../../api/user.js");
 const utils_utils = require("../../utils/utils.js");
 const store_uaeUserStore = require("../../store/uaeUserStore.js");
 const store_useBluetoothStore = require("../../store/useBluetoothStore.js");
+const store_useStorageStore = require("../../store/useStorageStore.js");
 require("../../utils/request.js");
 require("../../store/index.js");
 require("../../utils/functions.js");
@@ -19,6 +20,7 @@ if (!Array) {
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "login",
   setup(__props) {
+    const { HANDLE_CLEARSTORAGE } = store_useStorageStore.useStorageStore();
     const { HANDLE_INITBLUETOOTH } = store_useBluetoothStore.useBluetoothStore();
     const userStore = store_uaeUserStore.useUserStore();
     const { HANDLE_ACCTOKEN, HANDLE_REFTOKEN, HANDLE_USERINFO } = userStore;
@@ -48,6 +50,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     });
     common_vendor.onShow(() => {
       const timer = setTimeout(() => {
+        HANDLE_CLEARSTORAGE();
         clearTimeout(timer);
       }, 2e3);
     });

unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js

@@ -10,12 +10,20 @@ require("../../../utils/base64.js");
 require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
+  const _easycom_uni_th2 = common_vendor.resolveComponent("uni-th");
+  const _easycom_uni_tr2 = common_vendor.resolveComponent("uni-tr");
+  const _easycom_uni_td2 = common_vendor.resolveComponent("uni-td");
+  const _easycom_uni_table2 = common_vendor.resolveComponent("uni-table");
   const _component_BasicContainer = common_vendor.resolveComponent("BasicContainer");
   const _component_tiplist = common_vendor.resolveComponent("tiplist");
-  (_component_BasicContainer + _component_tiplist)();
+  (_easycom_uni_th2 + _easycom_uni_tr2 + _easycom_uni_td2 + _easycom_uni_table2 + _component_BasicContainer + _component_tiplist)();
 }
+const _easycom_uni_th = () => "../../../uni_modules/uni-table/components/uni-th/uni-th.js";
+const _easycom_uni_tr = () => "../../../uni_modules/uni-table/components/uni-tr/uni-tr.js";
+const _easycom_uni_td = () => "../../../uni_modules/uni-table/components/uni-td/uni-td.js";
+const _easycom_uni_table = () => "../../../uni_modules/uni-table/components/uni-table/uni-table.js";
 if (!Math) {
-  cusSelects();
+  (cusSelects + _easycom_uni_th + _easycom_uni_tr + _easycom_uni_td + _easycom_uni_table)();
 }
 const cusSelects = () => "../../../compoment/cus-selects-fan/cus-selects-fan.js";
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
@@ -88,7 +96,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         // 分页总页数
         pages: 1,
         data: []
-      }
+      },
+      /** 滑动区域高度 */
+      scrollHeight: ""
     });
     const tiplists = common_vendor.ref(null);
     const basicContainer = common_vendor.ref(null);
@@ -114,6 +124,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       let response1 = await api_user.deliveryInventory(data);
       details.stock.data = response1.data || [];
     });
+    common_vendor.onMounted(async () => {
+      await common_vendor.nextTick$1();
+      details.scrollHeight = utils.getViewDistanceFormTop(".scve").then((res) => {
+        console.log("res :>> ", res);
+        details.scrollHeight = res;
+      });
+    });
     const loadingNub = common_vendor.computed(() => {
       let num = 0;
       if (details.order.data)
@@ -446,76 +463,116 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             d: common_vendor.t(item.loadingNub),
             e: common_vendor.unref(listcheckindex) == index
           }, common_vendor.unref(listcheckindex) == index ? {
-            f: common_vendor.f(item.distributionAppParcelListVOS, (ite, k1, i1) => {
+            f: "6197e305-4-" + i0 + "," + ("6197e305-3-" + i0),
+            g: common_vendor.p({
+              align: "left"
+            }),
+            h: "6197e305-5-" + i0 + "," + ("6197e305-3-" + i0),
+            i: common_vendor.p({
+              align: "left"
+            }),
+            j: "6197e305-6-" + i0 + "," + ("6197e305-3-" + i0),
+            k: common_vendor.p({
+              align: "left"
+            }),
+            l: "6197e305-7-" + i0 + "," + ("6197e305-3-" + i0),
+            m: common_vendor.p({
+              align: "center"
+            }),
+            n: "6197e305-3-" + i0 + "," + ("6197e305-2-" + i0),
+            o: common_vendor.f(item.distributionAppParcelListVOS, (ite, k1, i1) => {
               return {
                 a: common_vendor.t(ite.orderPackageCode),
-                b: common_vendor.t(ite.thirdProduct),
+                b: "6197e305-9-" + i0 + "-" + i1 + "," + ("6197e305-8-" + i0 + "-" + i1),
-                c: common_vendor.t(ite.isScan ? ite.isScan : "未扫")
+                c: common_vendor.t(ite.thirdProduct),
+                d: "6197e305-10-" + i0 + "-" + i1 + "," + ("6197e305-8-" + i0 + "-" + i1),
+                e: common_vendor.t(ite.isScan),
+                f: "6197e305-11-" + i0 + "-" + i1 + "," + ("6197e305-8-" + i0 + "-" + i1),
+                g: common_vendor.t(ite.isAbnnormalSigningName || ite.isAbnormalLoadingName || "/"),
+                h: "6197e305-12-" + i0 + "-" + i1 + "," + ("6197e305-8-" + i0 + "-" + i1),
+                i: Number(ite.isAbnormalLoading) === 1 || Number(ite.isAbnnormalSigning) === 1 ? 1 : "",
+                j: "6197e305-8-" + i0 + "-" + i1 + "," + ("6197e305-2-" + i0)
               };
+            }),
+            p: common_vendor.p({
+              align: "center"
+            }),
+            q: common_vendor.sr("uniTable1", "6197e305-2-" + i0 + ",6197e305-0", {
+              "f": 1
+            }),
+            r: common_vendor.o(() => {
+            }, item),
+            s: "6197e305-2-" + i0 + ",6197e305-0",
+            t: common_vendor.p({
+              border: true,
+              emptyText: "暂无更多数据"
             })
           } : {}, {
-            g: item.complete
+            v: item.complete
           }, item.complete ? {
-            h: common_vendor.t(item.complete),
+            w: common_vendor.t(item.complete),
-            i: common_vendor.n(item.completecode == 3 ? "tip tp1" : item.completecode == 1 ? "tip tp2" : "tip tp3")
+            x: common_vendor.n(item.completecode == 3 ? "tip tp1" : item.completecode == 1 ? "tip tp2" : "tip tp3")
           } : {}, {
-            j: item.isHaveAbnormalPackageName
+            y: item.isHaveAbnormalPackageName
           }, item.isHaveAbnormalPackageName ? {
-            k: common_vendor.t(item.isHaveAbnormalPackageName)
+            z: common_vendor.t(item.isHaveAbnormalPackageName)
           } : {}, {
-            l: common_vendor.o(($event) => checkphon(item, index), item)
+            A: common_vendor.o(($event) => checkphon(item, index), item)
           }) : common_vendor.unref(orderStatus) == 2 ? common_vendor.e({
-            m: common_vendor.o(($event) => goorderdetail(item), item),
+            B: common_vendor.o(($event) => goorderdetail(item), item),
-            n: common_vendor.t(item.orderCode),
+            C: common_vendor.t(item.orderCode),
-            o: common_vendor.o(($event) => goorderdetail(item), item),
+            D: common_vendor.o(($event) => goorderdetail(item), item),
-            p: common_vendor.t(item.descriptionGoods),
+            E: common_vendor.t(item.descriptionGoods),
-            q: common_vendor.t(item.reservationNum),
+            F: common_vendor.t(item.reservationNum),
-            r: common_vendor.t(item.loadingNub),
+            G: common_vendor.t(item.loadingNub),
-            s: item.complete
+            H: item.complete
           }, item.complete ? {
-            t: common_vendor.t(item.complete),
+            I: common_vendor.t(item.complete),
-            v: common_vendor.n(item.completecode == 3 ? "tip tp1" : item.completecode == 1 ? "tip tp2" : "tip tp3")
+            J: common_vendor.n(item.completecode == 3 ? "tip tp1" : item.completecode == 1 ? "tip tp2" : "tip tp3")
           } : {}, {
-            w: common_vendor.o(($event) => checkphon(item, index), item)
+            K: common_vendor.o(($event) => checkphon(item, index), item)
           }) : common_vendor.unref(orderStatus) == 3 ? common_vendor.e({
-            x: common_vendor.t(item.sku),
+            L: common_vendor.t(item.sku),
-            y: common_vendor.t(item.descriptionGoods),
+            M: common_vendor.t(item.descriptionGoods),
-            z: common_vendor.t(item.cargoNorms),
+            N: common_vendor.t(item.cargoNorms),
-            A: item.signingStatusName === "待备货"
+            O: item.signingStatusName === "待备货"
           }, item.signingStatusName === "待备货" ? {
-            B: common_vendor.t(item.signingStatusName)
+            P: common_vendor.t(item.signingStatusName)
           } : {
-            C: common_vendor.t(item.stockPackageCode || "暂无数据")
+            Q: common_vendor.t(item.stockPackageCode || "暂无数据")
           }, {
-            D: common_vendor.t(item.cargoUnit),
+            R: common_vendor.t(item.cargoUnit),
-            E: item.loadingStatusName
+            S: item.loadingStatusName
           }, item.loadingStatusName ? {
-            F: common_vendor.t(item.loadingStatusName),
+            T: common_vendor.t(item.loadingStatusName),
-            G: common_vendor.n(item.loadingStatusName == "未装车" ? "tip tp2" : "tip tp1")
+            U: common_vendor.n(item.loadingStatusName == "未装车" ? "tip tp2" : "tip tp1")
           } : {}, {
-            H: common_vendor.o(($event) => checkphon(item, index), item)
+            V: common_vendor.o(($event) => checkphon(item, index), item)
           }) : {}, {
-            I: item
+            W: item
           });
         }),
         v: common_vendor.unref(orderStatus) == 1,
         w: common_vendor.unref(orderStatus) == 2,
         x: common_vendor.unref(orderStatus) == 3,
-        y: common_vendor.o(() => {
+        y: common_vendor.unref(details).scrollHeight,
+        z: common_vendor.o(() => {
+        }),
+        A: common_vendor.o(() => {
         }),
-        z: common_vendor.o(reatchBottom),
+        B: common_vendor.o(reatchBottom),
-        A: common_vendor.sr(basicContainer, "63b9eb44-0", {
+        C: common_vendor.sr(basicContainer, "6197e305-0", {
           "k": "basicContainer"
         }),
-        B: common_vendor.p({
+        D: common_vendor.p({
           option
         }),
-        C: common_vendor.sr(tiplists, "63b9eb44-2", {
+        E: common_vendor.sr(tiplists, "6197e305-13", {
           "k": "tiplists"
         })
       };
     };
   }
 });
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "D:/worksp/logpm/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-6197e305"], ["__file", "D:/worksp/logpm/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.wxss

@@ -23,29 +23,7 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-.xialaxz {
+.butlur.data-v-6197e305 {
-  display: flex;
-  flex-direction: column;
-}
-.xialaxz > view {
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  border-top: 1rpx solid #00000010;
-  padding: 20rpx 0;
-  box-sizing: border-box;
-  font-size: 28rpx;
-  color: #092C4D;
-}
-.xialaxz > view > view {
-  word-wrap: break-word;
-  word-break: break-all;
-  margin-right: 10rpx;
-}
-.xialaxz > view > view:nth-last-child(1) {
-  margin-right: 0rpx;
-}
-.butlur {
   width: 200rpx !important;
   height: 64rpx !important;
   background: #D3832A;
@@ -57,12 +35,14 @@
   font-weight: 400;
   color: #FFFFFF;
 }
-.tabtip {
+.tabtip.data-v-6197e305 {
+  position: relative;
+  z-index: 999;
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
-.tabtip > view {
+.tabtip > view.data-v-6197e305 {
   width: 50%;
   display: flex;
   align-items: center;
@@ -72,18 +52,20 @@
   font-weight: 400;
   color: #90A0AF;
 }
-.tabtip > view > view {
+.tabtip > view > view.data-v-6197e305 {
   height: 80rpx;
   border-bottom: 8rpx solid #ffffff;
   display: flex;
   align-items: center;
   justify-content: center;
 }
-.tabtip .xz {
+.tabtip .xz.data-v-6197e305 {
   color: #D3832A;
   border-bottom: 8rpx solid #D3832A;
 }
-.hdtp {
+.hdtp.data-v-6197e305 {
+  position: relative;
+  z-index: 999;
   padding: 34rpx 32rpx;
   box-sizing: border-box;
   background-color: #ffffff;
@@ -91,7 +73,7 @@
   flex-direction: column;
   align-items: center;
 }
-.hdtp > view {
+.hdtp > view.data-v-6197e305 {
   width: 100%;
   display: flex;
   align-items: center;
@@ -101,23 +83,24 @@
   color: #092C4D;
   margin-bottom: 24rpx;
 }
-.hdtp > view:nth-last-child(1) {
+.hdtp > view.data-v-6197e305:nth-last-child(1) {
   margin-bottom: 0;
 }
-.hdtp > view > view {
+.hdtp > view > view.data-v-6197e305 {
   width: 50%;
 }
-.scve {
+.scve.data-v-6197e305 {
   width: 100%;
   height: 50vh;
   margin-top: 20rpx;
+  overflow: hidden;
 }
-.scve .mabx {
+.scve .mabx.data-v-6197e305 {
   display: flex;
   flex-direction: column;
   align-items: center;
 }
-.scve .mabx > .itec {
+.scve .mabx > .itec.data-v-6197e305 {
   width: 686rpx;
   background: #FFFFFF;
   border-radius: 8rpx;
@@ -127,10 +110,10 @@
   margin-bottom: 20rpx;
   overflow: hidden;
 }
-.scve .mabx > .itec:nth-last-child(1) {
+.scve .mabx > .itec.data-v-6197e305:nth-last-child(1) {
   margin-bottom: 0;
 }
-.scve .mabx > .itec > .contenbx1 {
+.scve .mabx > .itec > .contenbx1.data-v-6197e305 {
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -138,13 +121,13 @@
   color: #092C4D;
   margin-bottom: 20rpx;
 }
-.scve .mabx > .itec > .contenbx1:nth-last-child(1) {
+.scve .mabx > .itec > .contenbx1.data-v-6197e305:nth-last-child(1) {
   margin-bottom: 0;
 }
-.scve .mabx > .itec > .contenbx1 > view {
+.scve .mabx > .itec > .contenbx1 > view.data-v-6197e305 {
   flex: 1;
 }
-.scve .mabx > .itec .tip {
+.scve .mabx > .itec .tip.data-v-6197e305 {
   position: absolute;
   right: 0;
   top: 0;
@@ -156,19 +139,21 @@
   justify-content: center;
   font-size: 24rpx;
 }
-.scve .mabx > .itec .tp1 {
+.scve .mabx > .itec .tp1.data-v-6197e305 {
   background-color: #0086F120;
   color: #0086F1;
 }
-.scve .mabx > .itec .tp2 {
+.scve .mabx > .itec .tp2.data-v-6197e305 {
   background-color: #F8544B20;
   color: #F8544B;
 }
-.scve .mabx > .itec .tp3 {
+.scve .mabx > .itec .tp3.data-v-6197e305 {
   background-color: #FA8C1620;
   color: #FA8C16;
 }
-.scinp {
+.scinp.data-v-6197e305 {
+  position: relative;
+  z-index: 999;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -176,12 +161,12 @@
   box-sizing: border-box;
   background-color: #ffffff;
 }
-.scinp > view:nth-of-type(1) {
+.scinp > view.data-v-6197e305:nth-of-type(1) {
   font-size: 28rpx;
   font-weight: 400;
   color: #092C4D;
 }
-.scinp .inputs {
+.scinp .inputs.data-v-6197e305 {
   width: 276rpx;
   height: 64rpx;
   background: #F5F5F6;
@@ -194,12 +179,12 @@
   font-weight: 400;
   color: #AFB4BA;
 }
-.scinp .inputs > input {
+.scinp .inputs > input.data-v-6197e305 {
   flex: 1;
   font-size: 24rpx;
   color: #092C4D;
 }
-.scinp .btscan {
+.scinp .btscan.data-v-6197e305 {
   width: 128rpx;
   height: 64rpx;
   background: #D3832A;
@@ -211,7 +196,9 @@
   font-weight: 400;
   color: #FFFFFF;
 }
-.hdtpnum {
+.hdtpnum.data-v-6197e305 {
+  position: relative;
+  z-index: 999;
   display: flex;
   align-items: center;
   justify-content: space-around;
@@ -219,7 +206,7 @@
   padding: 28rpx 0;
   border-bottom: 3rpx solid #EEEEEE;
 }
-.hdtpnum > view {
+.hdtpnum > view.data-v-6197e305 {
   display: flex;
   align-items: center;
   flex-direction: column;
@@ -227,25 +214,25 @@
   font-weight: 400;
   color: #092C4D;
 }
-.hdtpnum > view:nth-of-type(1) > view:nth-of-type(2) {
+.hdtpnum > view:nth-of-type(1) > view.data-v-6197e305:nth-of-type(2) {
   color: #092C4D;
 }
-.hdtpnum > view:nth-of-type(2) > view:nth-of-type(2) {
+.hdtpnum > view:nth-of-type(2) > view.data-v-6197e305:nth-of-type(2) {
   color: #0086F1;
 }
-.hdtpnum > view:nth-of-type(3) > view:nth-of-type(2) {
+.hdtpnum > view:nth-of-type(3) > view.data-v-6197e305:nth-of-type(2) {
   color: #3AD8BC;
 }
-.hdtpnum > view:nth-of-type(4) > view:nth-of-type(2) {
+.hdtpnum > view:nth-of-type(4) > view.data-v-6197e305:nth-of-type(2) {
   color: #FA8C16;
 }
-.hdtpnum > view > view:nth-of-type(2) {
+.hdtpnum > view > view.data-v-6197e305:nth-of-type(2) {
   font-size: 36rpx;
   font-weight: 400;
   color: #092C4D;
   margin-top: 20rpx;
 }
-.abnormalStyleContainer {
+.abnormalStyleContainer.data-v-6197e305 {
   top: -20rpx;
   left: -20rpx;
   position: absolute;
@@ -253,7 +240,7 @@
   border: 1rpx solid #f8544b;
   border-radius: 50%;
 }
-.abnormalStyle {
+.abnormalStyle.data-v-6197e305 {
   font-size: 28rpx;
   height: 80rpx;
   width: 80rpx;
@@ -265,4 +252,26 @@
   border-radius: 50%;
   border: 1rpx solid #f8544b;
   opacity: 0.6;
+}
+.uni-table-scroll.data-v-6197e305 {
+  zoom: 0.8;
+}
+.uni-table-td.data-v-6197e305,
+.uni-table-th.data-v-6197e305 {
+  padding: 10rpx;
+}
+.active.data-v-6197e305 {
+  background-color: #ff4344;
+}
+.active view.data-v-6197e305 {
+  color: #fff;
+}
+.active td.data-v-6197e305 {
+  color: #fff;
+}
+.uni-table .active.data-v-6197e305:hover {
+  background: #ff4344 !important;
+}
+.uni-scroll-view.data-v-6197e305 {
+  overflow: hidden;
 }

unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js

@@ -25,7 +25,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       items: {},
       id: "",
       datalist: [],
-      authbuts: common_vendor.index.getStorageSync("authbuts"),
+      authbuts: [],
       imgList: [],
       isChange: false,
       changeImageList: [],
@@ -50,6 +50,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         }
       ]
     });
+    details.authbuts = common_vendor.index.getStorageSync("authbuts") || [];
     const tiplists = common_vendor.ref(null);
     common_vendor.onLoad((op) => {
       details.items = JSON.parse(op.item);
@@ -116,7 +117,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       let response = await api_user.signforcustom(data);
       if (response.code !== 200)
         return;
-      const _arr = response.data.records;
+      const _arr = response.data;
       const _fastArr = [];
       const _commonArr = [];
       console.log("_arr :>> ", _arr);
@@ -141,6 +142,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           details.isChange = true;
           imglis = res.data.deliverySignPictures;
           details.imgList.forEach((item2, index) => {
+            item2.imgList = [];
             if (!imglis[item2.dictKey])
               return;
             details.imgList[index].imgList = imglis[item2.dictKey];

unpackage/dist/dev/mp-weixin/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.js

@@ -40,11 +40,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       details.id = op.id;
       details.items = JSON.parse(op.item);
     });
-    common_vendor.onShow(() => {
+    common_vendor.onShow(async () => {
-      const timer = setTimeout(() => {
+      await common_vendor.nextTick$1();
-        basicContainer.value.startPullDownRefresh();
+      basicContainer.value.startPullDownRefresh();
-        clearTimeout(timer);
-      }, 200);
     });
     const ordernumber = common_vendor.computed(() => {
       let num = 0;
@@ -62,7 +60,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     });
     const scannedNumber = common_vendor.computed(() => {
       let num = 0;
-      details.datalist.map((item) => {
+      details.datalist.forEach((item) => {
+        console.log("item.loadingNub :>> ", item.loadingNub);
         num += Number(item.loadingNub);
       });
       return num;

unpackage/dist/dev/mp-weixin/pagesHome/pages/DownGoods/DownGoods.js

@@ -122,6 +122,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       console.log("111 :>> ", 111);
       details.scandataList.push(_scancode);
       try {
+        common_vendor.index.showLoading({
+          mask: true
+        });
         let res = null;
         let data = null;
         switch (Number(details.pageType)) {
@@ -192,6 +195,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       } catch (err) {
         console.log("err :>> ", err);
       } finally {
+        common_vendor.index.hideLoading();
         details.scandataList.splice(details.scandataList.indexOf(_scancode), 1);
       }
     }

unpackage/dist/dev/mp-weixin/pagesHome/pages/PeopleScanUp/PeopleScanUp.js

@@ -3,6 +3,7 @@ const common_vendor = require("../../../common/vendor.js");
 const api_user = require("../../../api/user.js");
 const utils_utils = require("../../../utils/utils.js");
 const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
+const store_useStorageStore = require("../../../store/useStorageStore.js");
 require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
@@ -24,6 +25,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "PeopleScanUp",
   setup(__props) {
     common_vendor.storeToRefs(store_useSystemSettingsStore.useSystemSettingsStore());
+    store_useStorageStore.useStorageStore();
     const tip = common_vendor.ref(null);
     const tiplists = common_vendor.ref(null);
     let details = common_vendor.reactive({

unpackage/dist/dev/mp-weixin/pagesHome/pages/Relocation/Relocation.js

@@ -3,6 +3,7 @@ const common_vendor = require("../../../common/vendor.js");
 const api_user = require("../../../api/user.js");
 const utils_utils = require("../../../utils/utils.js");
 const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
+const store_useStorageStore = require("../../../store/useStorageStore.js");
 require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
@@ -22,6 +23,7 @@ if (!Math) {
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "Relocation",
   setup(__props) {
+    const { HANDLE_ISSTORAGECODE } = store_useStorageStore.useStorageStore();
     common_vendor.storeToRefs(store_useSystemSettingsStore.useSystemSettingsStore());
     const tip = common_vendor.ref(null);
     let details = common_vendor.reactive({
@@ -79,60 +81,51 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       });
       console.log(details.codenumer);
     });
-    async function scandata() {
+    const scanStorage = async (scancode2) => {
-      let res = null;
+      let data = {
-      if (!details.allocationId) {
+        allocationId: scancode2
-        if (details.scancode[0] === "T") {
+      };
-          common_vendor.index.showToast({
+      const res = await api_user.warehouseUpdownTypemoveAllocationScanTarget(data);
-            title: "请扫描库位码",
+      console.log("res1 :>> ", res);
-            icon: "none"
+      if (res.code == 200) {
-          });
+        details.dtilobj = res.data;
-          return;
+        details.allocationId = res.data.allocationId;
-        }
+        details.scancode = "";
-        let data = {
+        if (details.pagetype === "1") {
-          allocationId: details.scancode
+          if (details.dtilobj.trayCode) {
-        };
+            utils_utils.utils.ttsspke("该库位已绑托盘");
-        res = await api_user.warehouseUpdownTypemoveAllocationScanTarget(data);
+            return common_vendor.index.startPullDownRefresh({});
-        console.log("res1 :>> ", res);
+          }
-        if (res.code == 200) {
+          utils_utils.utils.ttsspke("扫描成功, 请扫描需要移动的托盘");
-          details.dtilobj = res.data;
+        } else if (details.pagetype === "2")
-          details.allocationId = res.data.allocationId;
+          utils_utils.utils.ttsspke("扫描成功, 请扫描需要移动的包条");
-          details.scancode = "";
-          if (details.pagetype === "1") {
-            if (details.dtilobj.trayCode) {
-              utils_utils.utils.ttsspke("该库位已绑托盘");
-              return common_vendor.index.startPullDownRefresh({});
-            }
-            utils_utils.utils.ttsspke("扫描成功, 请扫描需要移动的托盘");
-          } else if (details.pagetype === "2")
-            utils_utils.utils.ttsspke("扫描成功, 请扫描需要移动的包条");
-        }
-        return;
       }
-      if (details.scancodeList.includes(details.scancode)) {
+    };
+    const scanOther = async (scancode2) => {
+      let res = null;
+      if (details.scancodeList.includes(scancode2)) {
         common_vendor.index.showToast({
           title: "重复扫描",
           icon: "none"
         });
         return;
       }
-      details.scancodeList.push(details.scancode);
       try {
         if (details.pagetype == "1") {
           let data = {
-            trayCode: details.scancode
+            trayCode: scancode2
           };
           res = await api_user.warehouseUpdownTypemoveAllocationScanTrayCode(data);
           console.log("res :>> ", res);
           if (res.code !== 200)
             return;
-          details.trayCode = details.scancode;
+          details.trayCode = scancode2;
           details.scanlist = res.data.list;
           details.obldate = res.data;
         } else if (details.pagetype == "2") {
           let data = {
             allocationId: details.allocationId,
-            orderPackageCode: details.scancode
+            orderPackageCode: scancode2
           };
           res = await api_user.warehouseUpdownTypemoveAllocationScanPackage(data);
           console.log("res :>> ", res);
@@ -140,9 +133,17 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             details.scanlist.push(res.data);
           }
         }
+        details.scancodeList.push(scancode2);
       } catch (err) {
         console.log("err :>> ", err);
       }
+    };
+    async function scandata() {
+      const { scancode: scancode2 } = details;
+      if (HANDLE_ISSTORAGECODE(scancode2))
+        return scanStorage(scancode2);
+      else
+        scanOther(scancode2);
     }
     async function uplist() {
       let res = null;
@@ -302,12 +303,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         D: common_vendor.o(($event) => setstate(false)),
         E: common_vendor.o(uplist)
       }) : {}) : {}, {
-        F: common_vendor.sr(tip, "7685f104-1", {
+        F: common_vendor.sr(tip, "6e763ec5-1", {
           "k": "tip"
         })
       });
     };
   }
 });
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "D:/worksp/logpm/pagesHome/pages/Relocation/Relocation.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-6e763ec5"], ["__file", "D:/worksp/logpm/pagesHome/pages/Relocation/Relocation.vue"]]);
 wx.createPage(MiniProgramPage);

unpackage/dist/dev/mp-weixin/pagesHome/pages/Relocation/Relocation.wxss

@@ -23,7 +23,7 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-.bgtps {
+.bgtps.data-v-6e763ec5 {
   width: 100vw;
   height: 100vh;
   position: fixed;
@@ -35,7 +35,7 @@
   align-items: center;
   justify-content: center;
 }
-.bgtps > .anjian {
+.bgtps > .anjian.data-v-6e763ec5 {
   width: 640rpx;
   background: #FFFFFF;
   border-radius: 8rpx;
@@ -45,20 +45,20 @@
   box-sizing: border-box;
   padding: 25rpx 20rpx;
 }
-.bgtps > .anjian > .titqr {
+.bgtps > .anjian > .titqr.data-v-6e763ec5 {
   font-size: 32rpx;
   font-weight: 400;
   color: #092C4D;
   margin-bottom: 30rpx;
 }
-.bgtps > .anjian > .contenbx {
+.bgtps > .anjian > .contenbx.data-v-6e763ec5 {
   width: 580rpx;
   display: flex;
   align-items: center;
   flex-direction: column;
   margin-bottom: 20rpx;
 }
-.bgtps > .anjian > .contenbx .titypo {
+.bgtps > .anjian > .contenbx .titypo.data-v-6e763ec5 {
   font-size: 30rpx;
   width: 100%;
   display: flex;
@@ -66,53 +66,53 @@
   justify-content: flex-start;
   margin-bottom: 40rpx;
 }
-.bgtps > .anjian > .contenbx > .topbs1 {
+.bgtps > .anjian > .contenbx > .topbs1.data-v-6e763ec5 {
   width: 100%;
   display: flex;
   align-items: center;
   justify-content: flex-start;
   margin-bottom: 30rpx;
 }
-.bgtps > .anjian > .contenbx > .topbs1:nth-last-child(1) {
+.bgtps > .anjian > .contenbx > .topbs1.data-v-6e763ec5:nth-last-child(1) {
   margin-bottom: 0;
 }
-.bgtps > .anjian > .contenbx > .topbs1 > view:nth-of-type(1) {
+.bgtps > .anjian > .contenbx > .topbs1 > view.data-v-6e763ec5:nth-of-type(1) {
   width: 140rpx;
   font-size: 30rpx;
 }
-.bgtps > .anjian > .contenbx > .topbs1 > view:nth-of-type(2) {
+.bgtps > .anjian > .contenbx > .topbs1 > view.data-v-6e763ec5:nth-of-type(2) {
   display: flex;
   align-items: center;
   flex: 1;
 }
-.bgtps > .anjian > .contenbx > .topbs1 > view:nth-of-type(2) > view:nth-of-type(1) {
+.bgtps > .anjian > .contenbx > .topbs1 > view:nth-of-type(2) > view.data-v-6e763ec5:nth-of-type(1) {
   display: flex;
   flex-direction: column;
   align-items: center;
   margin-right: 20rpx;
 }
-.bgtps > .anjian > .contenbx > .topbs1 > view:nth-of-type(2) > view:nth-of-type(1) > image {
+.bgtps > .anjian > .contenbx > .topbs1 > view:nth-of-type(2) > view:nth-of-type(1) > image.data-v-6e763ec5 {
   width: 72rpx;
   height: 72rpx;
 }
-.bgtps > .anjian > .contenbx > .topbs1 > view:nth-of-type(2) > view:nth-of-type(1) > view {
+.bgtps > .anjian > .contenbx > .topbs1 > view:nth-of-type(2) > view:nth-of-type(1) > view.data-v-6e763ec5 {
   font-size: 24rpx;
   font-weight: 400;
   color: #90A0AF;
 }
-.bgtps > .anjian > .contenbx > .topbs1 > view:nth-of-type(2) > view:nth-of-type(2) {
+.bgtps > .anjian > .contenbx > .topbs1 > view:nth-of-type(2) > view.data-v-6e763ec5:nth-of-type(2) {
   flex: 1;
   font-size: 28rpx;
   font-weight: 400;
   color: #020B18;
 }
-.bgtps > .anjian .btbox {
+.bgtps > .anjian .btbox.data-v-6e763ec5 {
   display: flex;
   align-items: center;
   justify-content: center;
   margin-top: 20rpx;
 }
-.bgtps > .anjian .btbox > view {
+.bgtps > .anjian .btbox > view.data-v-6e763ec5 {
   width: 260rpx;
   height: 88rpx;
   border-radius: 8rpx;
@@ -122,16 +122,16 @@
   box-sizing: border-box;
   font-size: 32rpx;
 }
-.bgtps > .anjian .btbox > view:nth-of-type(1) {
+.bgtps > .anjian .btbox > view.data-v-6e763ec5:nth-of-type(1) {
   background-color: #F5F5F6;
   color: #5A6875;
 }
-.bgtps > .anjian .btbox > view:nth-of-type(2) {
+.bgtps > .anjian .btbox > view.data-v-6e763ec5:nth-of-type(2) {
   background-color: #D3832A;
   color: #FFFFFF;
   margin-left: 20rpx;
 }
-.bgtps > .trary {
+.bgtps > .trary.data-v-6e763ec5 {
   width: 640rpx;
   background: #FFFFFF;
   border-radius: 8rpx;
@@ -141,65 +141,65 @@
   align-items: center;
   box-sizing: border-box;
 }
-.bgtps > .trary > .titqr {
+.bgtps > .trary > .titqr.data-v-6e763ec5 {
   font-size: 32rpx;
   font-weight: 400;
   color: #092C4D;
   margin-bottom: 30rpx;
 }
-.bgtps > .trary .contenbox {
+.bgtps > .trary .contenbox.data-v-6e763ec5 {
   width: 580rpx;
   display: flex;
   align-items: center;
   flex-direction: column;
   margin-bottom: 20rpx;
 }
-.bgtps > .trary .contenbox > .topbs1 {
+.bgtps > .trary .contenbox > .topbs1.data-v-6e763ec5 {
   width: 100%;
   display: flex;
   align-items: center;
   margin-bottom: 30rpx;
 }
-.bgtps > .trary .contenbox > .topbs1:nth-last-child(1) {
+.bgtps > .trary .contenbox > .topbs1.data-v-6e763ec5:nth-last-child(1) {
   margin-bottom: 0;
 }
-.bgtps > .trary .contenbox > .topbs1 > view:nth-of-type(1) {
+.bgtps > .trary .contenbox > .topbs1 > view.data-v-6e763ec5:nth-of-type(1) {
   width: 140rpx;
   font-size: 30rpx;
 }
-.bgtps > .trary .contenbox > .topbs1 > view:nth-of-type(2) {
+.bgtps > .trary .contenbox > .topbs1 > view.data-v-6e763ec5:nth-of-type(2) {
   display: flex;
   align-items: center;
   flex: 1;
 }
-.bgtps > .trary .contenbox > .topbs1 > view:nth-of-type(2) > view:nth-of-type(1) {
+.bgtps > .trary .contenbox > .topbs1 > view:nth-of-type(2) > view.data-v-6e763ec5:nth-of-type(1) {
   display: flex;
   flex-direction: column;
   align-items: center;
   margin-right: 20rpx;
 }
-.bgtps > .trary .contenbox > .topbs1 > view:nth-of-type(2) > view:nth-of-type(1) > image {
+.bgtps > .trary .contenbox > .topbs1 > view:nth-of-type(2) > view:nth-of-type(1) > image.data-v-6e763ec5 {
   width: 72rpx;
   height: 72rpx;
 }
-.bgtps > .trary .contenbox > .topbs1 > view:nth-of-type(2) > view:nth-of-type(1) > view {
+.bgtps > .trary .contenbox > .topbs1 > view:nth-of-type(2) > view:nth-of-type(1) > view.data-v-6e763ec5 {
   font-size: 24rpx;
   font-weight: 400;
   color: #90A0AF;
 }
-.bgtps > .trary .contenbox > .topbs1 > view:nth-of-type(2) > view:nth-of-type(2) {
+.bgtps > .trary .contenbox > .topbs1 > view:nth-of-type(2) > view.data-v-6e763ec5:nth-of-type(2) {
   flex: 1;
   font-size: 28rpx;
   font-weight: 400;
   color: #020B18;
 }
-.bgtps > .trary .btbox {
+.bgtps > .trary .btbox.data-v-6e763ec5 {
   display: flex;
   align-items: center;
   justify-content: center;
   margin-top: 20rpx;
 }
-.bgtps > .trary .btbox > view {
+.bgtps > .trary .btbox > view.data-v-6e763ec5 {
   width: 260rpx;
   height: 88rpx;
   border-radius: 8rpx;
@@ -209,16 +209,16 @@
   box-sizing: border-box;
   font-size: 32rpx;
 }
-.bgtps > .trary .btbox > view:nth-of-type(1) {
+.bgtps > .trary .btbox > view.data-v-6e763ec5:nth-of-type(1) {
   background-color: #F5F5F6;
   color: #5A6875;
 }
-.bgtps > .trary .btbox > view:nth-of-type(2) {
+.bgtps > .trary .btbox > view.data-v-6e763ec5:nth-of-type(2) {
   background-color: #D3832A;
   color: #FFFFFF;
   margin-left: 20rpx;
 }
-.tuopanview {
+.tuopanview.data-v-6e763ec5 {
   position: relative;
   display: flex;
   flex-direction: column;
@@ -230,27 +230,27 @@
   padding: 30rpx 24rpx;
   box-sizing: border-box;
 }
-.tuopanview > view {
+.tuopanview > view.data-v-6e763ec5 {
   font-size: 28rpx;
   font-weight: 400;
   color: #020B18;
 }
-.tuopanview > view:nth-of-type(1) {
+.tuopanview > view.data-v-6e763ec5:nth-of-type(1) {
   margin-bottom: 30rpx;
 }
-.tuopanview > view:nth-of-type(2) {
+.tuopanview > view.data-v-6e763ec5:nth-of-type(2) {
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
-.butbox {
+.butbox.data-v-6e763ec5 {
   display: flex;
   align-items: center;
   justify-content: center;
   margin-top: 15rpx;
   font-size: 32rpx;
 }
-.butbox > view:nth-of-type(1) {
+.butbox > view.data-v-6e763ec5:nth-of-type(1) {
   width: 320rpx;
   height: 100rpx;
   background: #FFFFFF;
@@ -262,7 +262,7 @@
   font-size: 32rpx;
   font-weight: 400;
 }
-.butbox > view:nth-of-type(2) {
+.butbox > view.data-v-6e763ec5:nth-of-type(2) {
   width: 320rpx;
   height: 100rpx;
   background: #D3832A;
@@ -276,19 +276,19 @@
   color: #FFFFFF;
   margin-left: 20rpx;
 }
-.sclcs {
+.sclcs.data-v-6e763ec5 {
   width: 686rpx;
   height: 40vh;
   margin: auto;
   margin-top: 20rpx;
 }
-.sclcs .visc {
+.sclcs .visc.data-v-6e763ec5 {
   width: 100%;
   display: flex;
   flex-direction: column;
   align-items: center;
 }
-.sclcs .visc .item1 {
+.sclcs .visc .item1.data-v-6e763ec5 {
   width: 686rpx;
   padding: 0 24rpx;
   box-sizing: border-box;
@@ -297,21 +297,21 @@
   position: relative;
   margin-bottom: 30rpx;
 }
-.sclcs .visc .item1:nth-last-child(1) {
+.sclcs .visc .item1.data-v-6e763ec5:nth-last-child(1) {
   margin-bottom: 0;
 }
-.sclcs .visc .item1 .removeicons {
+.sclcs .visc .item1 .removeicons.data-v-6e763ec5 {
   position: absolute;
   right: 0;
 }
-.sclcs .visc .item1 .qtimgzt {
+.sclcs .visc .item1 .qtimgzt.data-v-6e763ec5 {
   width: 96rpx;
   height: 96rpx;
   position: absolute;
   right: 0;
   top: 0;
 }
-.sclcs .visc .item1 > view {
+.sclcs .visc .item1 > view.data-v-6e763ec5 {
   width: 100%;
   display: flex;
   align-items: center;
@@ -319,26 +319,26 @@
   box-sizing: border-box;
   border-bottom: 4rpx solid #EEEEEE;
 }
-.sclcs .visc .item1 > view:nth-last-child(1) {
+.sclcs .visc .item1 > view.data-v-6e763ec5:nth-last-child(1) {
   border-bottom: 0rpx solid #EEEEEE00 !important;
 }
-.sclcs .visc .item1 > view > image {
+.sclcs .visc .item1 > view > image.data-v-6e763ec5 {
   width: 32rpx;
   height: 32rpx;
   margin-right: 15rpx;
 }
-.sclcs .visc .item1 > view > view {
+.sclcs .visc .item1 > view > view.data-v-6e763ec5 {
   font-size: 28rpx;
   font-weight: 400;
   color: #020B18;
   word-wrap: break-word;
   word-break: break-all;
 }
-.sclcs .visc .item1 > view > view .numb {
+.sclcs .visc .item1 > view > view .numb.data-v-6e763ec5 {
   font-size: 28rpx;
   color: #178AF2;
 }
-.sclcs .visc .item2 {
+.sclcs .visc .item2.data-v-6e763ec5 {
   width: 686rpx;
   margin: auto;
   padding: 0 24rpx;
@@ -348,25 +348,25 @@
   position: relative;
   margin-bottom: 30rpx;
 }
-.sclcs .visc .item2 .qtimgzt {
+.sclcs .visc .item2 .qtimgzt.data-v-6e763ec5 {
   width: 96rpx;
   height: 96rpx;
   position: absolute;
   right: 0;
   top: 0;
 }
-.sclcs .visc .item2 > .viewnum {
+.sclcs .visc .item2 > .viewnum.data-v-6e763ec5 {
   height: 100rpx;
   display: flex;
   align-items: center;
   justify-content: space-around;
 }
-.sclcs .visc .item2 > .viewnum > view {
+.sclcs .visc .item2 > .viewnum > view.data-v-6e763ec5 {
   font-size: 28rpx;
   font-weight: 400;
   color: #020B18;
 }
-.sclcs .visc .item2 {
+.sclcs .visc .item2.data-v-6e763ec5 {
   width: 686rpx;
   padding: 0 24rpx;
   box-sizing: border-box;
@@ -375,61 +375,61 @@
   position: relative;
   margin-bottom: 30rpx;
 }
-.sclcs .visc .item2 > .tpbx {
+.sclcs .visc .item2 > .tpbx.data-v-6e763ec5 {
   display: flex;
   align-items: center;
   padding: 18rpx 24rpx;
   box-sizing: border-box;
   border-bottom: 4rpx solid #EEEEEE;
 }
-.sclcs .visc .item2 > .tpbx > image {
+.sclcs .visc .item2 > .tpbx > image.data-v-6e763ec5 {
   width: 32rpx;
   height: 32rpx;
   margin-right: 15rpx;
 }
-.sclcs .visc .item2 > .tpbx > view {
+.sclcs .visc .item2 > .tpbx > view.data-v-6e763ec5 {
   font-size: 28rpx;
   font-weight: 400;
   color: #020B18;
 }
-.sclcs .visc .item2 > .tpbx > view .numb {
+.sclcs .visc .item2 > .tpbx > view .numb.data-v-6e763ec5 {
   font-size: 28rpx;
   color: #178AF2;
 }
-.sclcs .visc .item2 > .viewnum {
+.sclcs .visc .item2 > .viewnum.data-v-6e763ec5 {
   height: 100rpx;
   display: flex;
   align-items: center;
   justify-content: space-around;
 }
-.sclcs .visc .item2 > .viewnum > view {
+.sclcs .visc .item2 > .viewnum > view.data-v-6e763ec5 {
   font-size: 28rpx;
   font-weight: 400;
   color: #020B18;
 }
-.sclcs .visc .tpbx {
+.sclcs .visc .tpbx.data-v-6e763ec5 {
   display: flex;
   align-items: center;
   padding: 18rpx 24rpx;
   box-sizing: border-box;
   border-bottom: 4rpx solid #EEEEEE;
 }
-.sclcs .visc .tpbx > image {
+.sclcs .visc .tpbx > image.data-v-6e763ec5 {
   flex: none;
   width: 32rpx;
   height: 32rpx;
   margin-right: 15rpx;
 }
-.sclcs .visc .tpbx > view {
+.sclcs .visc .tpbx > view.data-v-6e763ec5 {
   font-size: 28rpx;
   font-weight: 400;
   color: #020B18;
 }
-.sclcs .visc .tpbx > view .numb {
+.sclcs .visc .tpbx > view .numb.data-v-6e763ec5 {
   font-size: 28rpx;
   color: #178AF2;
 }
-.tabchecklist {
+.tabchecklist.data-v-6e763ec5 {
   width: 684rpx;
   height: 100rpx;
   margin: auto;
@@ -440,32 +440,32 @@
   align-items: center;
   justify-content: space-around;
 }
-.tabchecklist .xz > view:nth-of-type(1) {
+.tabchecklist .xz > view.data-v-6e763ec5:nth-of-type(1) {
   color: #D3832A !important;
 }
-.tabchecklist .xz > view:nth-of-type(2) {
+.tabchecklist .xz > view.data-v-6e763ec5:nth-of-type(2) {
   background-color: #D3832A !important;
 }
-.tabchecklist > view {
+.tabchecklist > view.data-v-6e763ec5 {
   display: flex;
   flex-direction: column;
   align-items: center;
 }
-.tabchecklist > view > view:nth-of-type(1) {
+.tabchecklist > view > view.data-v-6e763ec5:nth-of-type(1) {
   font-size: 32rpx;
   font-weight: 400;
   margin-bottom: 20rpx;
   color: #020B18;
   transition: all 0.2s;
 }
-.tabchecklist > view > view:nth-of-type(2) {
+.tabchecklist > view > view.data-v-6e763ec5:nth-of-type(2) {
   width: 96rpx;
   height: 8rpx;
   background-color: #D3832A00;
   border-radius: 4rpx;
   transition: all 0.2s;
 }
-.topviewbox {
+.topviewbox.data-v-6e763ec5 {
   width: 686rpx;
   background: #FFFFFF;
   border-radius: 20rpx 20rpx 20rpx 20rpx;
@@ -475,7 +475,7 @@
   margin: auto;
   margin-top: 20rpx;
 }
-.topviewbox > .oebox {
+.topviewbox > .oebox.data-v-6e763ec5 {
   padding: 20rpx 25rpx;
   box-sizing: border-box;
   border-bottom: 4rpx solid #EEEEEE;
@@ -483,22 +483,22 @@
   align-items: center;
   justify-content: flex-start;
 }
-.topviewbox > .oebox > view {
+.topviewbox > .oebox > view.data-v-6e763ec5 {
   font-size: 32rpx;
   font-weight: 400;
   color: #020B18;
 }
-.topviewbox > .oebox > image {
+.topviewbox > .oebox > image.data-v-6e763ec5 {
   width: 32rpx;
   height: 32rpx;
   margin-right: 14rpx;
 }
-.topviewbox .numbox {
+.topviewbox .numbox.data-v-6e763ec5 {
   width: 100%;
   padding: 20rpx;
   box-sizing: border-box;
 }
-.topviewbox .numbox > view {
+.topviewbox .numbox > view.data-v-6e763ec5 {
   width: 640rpx;
   height: 160rpx;
   background: #F5F7FB;
@@ -508,44 +508,44 @@
   align-items: center;
   justify-content: space-around;
 }
-.topviewbox .numbox > view > view {
+.topviewbox .numbox > view > view.data-v-6e763ec5 {
   display: flex;
   flex-direction: column;
   align-items: center;
 }
-.topviewbox .numbox > view > view:nth-of-type(1) > view:nth-of-type(2) {
+.topviewbox .numbox > view > view:nth-of-type(1) > view.data-v-6e763ec5:nth-of-type(2) {
   color: #FF9545 !important;
 }
-.topviewbox .numbox > view > view:nth-of-type(2) > view:nth-of-type(2) {
+.topviewbox .numbox > view > view:nth-of-type(2) > view.data-v-6e763ec5:nth-of-type(2) {
   color: #178AF2 !important;
 }
-.topviewbox .numbox > view > view > view:nth-of-type(1) {
+.topviewbox .numbox > view > view > view.data-v-6e763ec5:nth-of-type(1) {
   font-size: 28rpx;
   font-weight: 400;
   color: #020B18;
   margin-bottom: 18rpx;
 }
-.topviewbox .numbox > view > view > view:nth-of-type(2) {
+.topviewbox .numbox > view > view > view.data-v-6e763ec5:nth-of-type(2) {
   font-size: 36rpx;
   font-weight: 400;
 }
-.topviewbox > .contview {
+.topviewbox > .contview.data-v-6e763ec5 {
   display: flex;
   flex-direction: column;
   width: 100%;
   padding: 20rpx;
   box-sizing: border-box;
 }
-.topviewbox > .contview > view {
+.topviewbox > .contview > view.data-v-6e763ec5 {
   display: flex;
   align-items: center;
   justify-content: flex-start;
   margin-bottom: 20rpx;
 }
-.topviewbox > .contview > view:nth-last-child(1) {
+.topviewbox > .contview > view.data-v-6e763ec5:nth-last-child(1) {
   margin-bottom: 0;
 }
-.topviewbox > .contview > view > view:nth-of-type(1) {
+.topviewbox > .contview > view > view.data-v-6e763ec5:nth-of-type(1) {
   display: flex;
   align-items: center;
   justify-content: flex-start;
@@ -556,25 +556,25 @@
   font-size: 28rpx;
   font-weight: 400;
 }
-.topviewbox > .contview > view > view:nth-of-type(1) > view {
+.topviewbox > .contview > view > view:nth-of-type(1) > view.data-v-6e763ec5 {
   font-size: 28rpx;
   font-weight: 400;
   color: #020B18;
 }
-.topviewbox > .contview > view > view:nth-of-type(2) {
+.topviewbox > .contview > view > view.data-v-6e763ec5:nth-of-type(2) {
   font-size: 28rpx;
   font-weight: 400;
   color: #020B18;
 }
-.topviewbox > .contview > view > view:nth-of-type(2) > input {
+.topviewbox > .contview > view > view:nth-of-type(2) > input.data-v-6e763ec5 {
   flex: 1;
 }
-.topviewbox > .contview > view .btm {
+.topviewbox > .contview > view .btm.data-v-6e763ec5 {
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
-.topviewbox > .contview > view .btm > view {
+.topviewbox > .contview > view .btm > view.data-v-6e763ec5 {
   width: 120rpx;
   height: 60rpx;
   background: #D3832A;
@@ -588,25 +588,25 @@
   color: #FFFFFF;
   margin-left: 20rpx;
 }
-.bgimg {
+.bgimg.data-v-6e763ec5 {
   position: absolute;
   left: 0;
   top: 0;
   width: 100%;
 }
-.scanqcview {
+.scanqcview.data-v-6e763ec5 {
   display: flex;
   align-items: center;
   justify-content: center;
   position: relative;
   margin-top: 10rpx;
 }
-.scanqcview > image {
+.scanqcview > image.data-v-6e763ec5 {
   width: 72rpx;
   height: 72rpx;
   margin-right: 16rpx;
 }
-.scanqcview > view {
+.scanqcview > view.data-v-6e763ec5 {
   font-size: 32rpx;
   font-weight: 400;
   color: #FFFFFF;

unpackage/dist/dev/mp-weixin/pagesHome/pages/ScanUp/ScanUp.js

@@ -2,6 +2,7 @@
 const common_vendor = require("../../../common/vendor.js");
 const api_user = require("../../../api/user.js");
 const store_useSystemSettingsStore = require("../../../store/useSystemSettingsStore.js");
+const store_useStorageStore = require("../../../store/useStorageStore.js");
 require("../../../utils/request.js");
 require("../../../store/index.js");
 require("../../../utils/functions.js");
@@ -21,6 +22,7 @@ if (!Math) {
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "ScanUp",
   setup(__props) {
+    const { HANDLE_ISSTORAGECODE } = store_useStorageStore.useStorageStore();
     common_vendor.storeToRefs(store_useSystemSettingsStore.useSystemSettingsStore());
     const utils = common_vendor.inject("utils");
     const tip = common_vendor.ref(null);
@@ -60,27 +62,18 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         details.renderList = [];
         details.datalist = [];
         details.uplistarr = [];
+        details.orderCodeArr = [];
         common_vendor.index.stopPullDownRefresh();
         clearTimeout(timer);
       }, 500);
     });
-    async function scandata() {
+    const scanStorage = async (code) => {
       var _a;
-      if (!details.allocationId) {
+      try {
-        console.log("details.scancode[0] :>> ", details.scancode[0]);
-        if (details.scancode[0] === "T") {
-          common_vendor.index.showToast({
-            title: "请扫描库位码",
-            icon: "none"
-          });
-          return;
-        }
-        console.log("111 :>> ", 111);
         let data = {
-          allocationId: details.scancode
+          allocationId: code
         };
         let res = await api_user.warehouseUpdownTypeupShelfScanAllocation(data);
-        console.log(res);
         if (res.code == 200) {
           details.reqobj = res.data;
           const _positionArr = details.reqobj.allocationTitle.split("-");
@@ -89,33 +82,42 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           details.datalist = ((_a = res.data) == null ? void 0 : _a.list) || [];
           if (details.checkstate === 2)
             return details.renderList = details.datalist;
+          if (Number(details.upshelfScanType) === 4 && details.datalist.length !== 0 && details.uplistarr.length !== 0) {
+            return utils.handleToast("该库位已有数据, 无法上架");
+          }
         }
-      } else {
+      } catch (err) {
-        if (Number(details.upshelfScanType) == 4 && details.reqobj.trayCode) {
+        console.log("err :>> ", err);
-          return;
+      }
+    };
+    const scanOther = async (_code) => {
+      try {
+        let content = "";
+        if (Number(details.upshelfScanType) == 4 && details.datalist.length !== 0) {
+          content = "该库位已有数据, 无法上架";
         }
         if (details.upshelfScanType === "3") {
-          const flag = details.uplistarr.findIndex((val) => val.orderPackageCode === details.scancode);
+          const flag = details.uplistarr.findIndex((val) => val.orderPackageCode === _code);
           if (flag !== -1) {
-            return;
+            content = "包件重复扫描";
           }
         }
+        if (content) {
+          utils.handleToast(content);
+          return;
+        }
         let data = {
           upshelfScanType: details.upshelfScanType,
-          code: details.scancode
+          code: _code
         };
         let res = await api_user.warehouseUpdownTypeupShelfScanGoods(data);
-        console.log("res>>>>>", res);
         if (res.code == 200) {
-          if (Number(details.upshelfScanType) !== 3) {
+          if (Number(details.upshelfScanType) === 1 || Number(details.upshelfScanType) === 2) {
-            const _uplistarr = details.uplistarr;
+            const _uplistarr = [...details.uplistarr];
-            const _orderCodeArr = details.orderCodeArr;
+            const _orderCodeArr = [...details.orderCodeArr];
             const _flag = res.data.every((val) => {
               if (details.orderCodeArr.includes(val.orderCode)) {
-                common_vendor.index.showToast({
+                utils.handleToast("订单已存在, 勿重复扫码");
-                  title: "订单已存在, 勿重复扫码",
-                  icon: "none"
-                });
                 return false;
               }
               _uplistarr.push(val);
@@ -126,8 +128,12 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
               return;
             details.uplistarr = _uplistarr;
             details.orderCodeArr = _orderCodeArr;
+          } else if (Number(details.upshelfScanType) === 3) {
+            if (!res.data)
+              return;
+            details.uplistarr = [...details.uplistarr, ...res.data];
           } else {
-            details.uplistarr = details.uplistarr.concat(res.data);
+            details.uplistarr = res.data;
           }
           let _content = "";
           if (details.upshelfScanType !== "3")
@@ -140,7 +146,21 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         } else if (res.code === 3001 && res.audio) {
           utils.ttsspke(res.audio);
         }
+      } catch (err) {
+        console.log("err :>> ", err);
       }
+    };
+    async function scandata() {
+      common_vendor.index.showLoading({
+        mask: true
+      });
+      const code = details.scancode;
+      const isStorageCode = HANDLE_ISSTORAGECODE(code);
+      common_vendor.index.hideLoading();
+      if (isStorageCode)
+        return scanStorage(code);
+      else
+        scanOther(code);
     }
     function goorderdetail(item, type) {
       if (type !== 1)
@@ -150,24 +170,22 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       });
     }
     function uplist() {
-      if (details.uplistarr.length == 0) {
+      let content = "";
-        let content = "";
+      if (details.allocationId === "") {
-        let msg = "";
+        content = "请先扫描库位";
-        if (details.allocationId === "") {
+      } else if (details.uplistarr.length === 0) {
-          content = "请先扫描库位";
+        if (Number(details.upshelfScanType) == 4) {
-          msg = "请先扫描库位";
-        } else if (Number(details.upshelfScanType) == 4) {
           content = "请先扫描托盘码";
-          msg = "请先扫描托盘码";
         } else {
           content = "请先扫描包件数据";
-          msg = "请先扫描包件";
         }
+      }
+      if (content) {
         common_vendor.index.showToast({
           title: content,
           icon: "none"
         });
-        utils.ttsspke(msg);
+        utils.ttsspke(content);
         return;
       }
       let _totalShelfNum = 0;

unpackage/dist/dev/mp-weixin/pagesHome/pages/SelfPScanList/SelfPScanList.wxml

@@ -1 +1 @@
-<basic-container wx:if="{{w}}" class="r" u-s="{{['head','body']}}" u-r="basicContainer" u-i="c23be978-0" bind:__l="__l" u-p="{{w}}"><view slot="head"><view class="hdtpnum"><view><view>订单总数</view><view>{{a}}</view></view><view><view>齐套数</view><view>{{b}}</view></view><view><view>自提件数</view><view>{{c}}</view></view><view><view>签收件数</view><view>{{d}}</view></view><view><view>库存品数</view><view>{{e}}</view></view></view><view class="scinp"><view>齐套状态</view><view><cus-selects wx:if="{{g}}" bindchange="{{f}}" u-i="c23be978-1,c23be978-0" bind:__l="__l" u-p="{{g}}"></cus-selects></view><view class="inputs"><input placeholder="请输入查询的订单号" value="{{h}}" bindinput="{{i}}"/></view><view class="btscan" bindtap="{{j}}">查询</view></view><view class="tabtip"><view bindtap="{{l}}"><view class="{{k}}">定制品</view></view><view bindtap="{{n}}"><view class="{{m}}">库存品</view></view><view bindtap="{{p}}"><view class="{{o}}">零担</view></view></view></view><scroll-view class="scve" scroll-y="true" slot="body"><view class="mabx"><block wx:for="{{q}}" wx:for-item="item" wx:key="s"><block wx:if="{{r}}"><view class="itec" bindtap="{{item.f}}"><view class="contenbx1"><view><text style="color:#90A0AF">订单编号：</text> {{item.a}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">配送数：</text>{{item.b}}</view><view><text style="color:#90A0AF">已扫码数：</text>{{item.c}}</view></view><view class="{{item.e}}">{{item.d}}</view></view></block><block wx:if="{{s}}"><view class="itec" bindtap="{{item.l}}"><view class="contenbx1"><view><text style="color:#90A0AF">SKU：</text>{{item.g}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">物品：</text>{{item.h}}</view><view><text style="color:#90A0AF">规格：</text>{{item.i}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">单位：</text>{{item.j}}</view><view><text style="color:#90A0AF">自提数：</text>{{item.k}}</view></view></view></block><block wx:if="{{t}}"><view class="itec" bindtap="{{item.r}}"><view class="contenbx1"><view><text style="color:#90A0AF">订单号：</text>{{item.m}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">运单号：</text>{{item.n}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">产品名称：</text>{{item.o}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">预计签收件数：</text>{{item.p}}</view><view><text style="color:#90A0AF">实际签收件数：</text>{{item.q}}</view></view></view></block></block></view></scroll-view></basic-container><tiplist class="r" u-r="tiplists" u-i="c23be978-2" bind:__l="__l"></tiplist>
+<basic-container wx:if="{{w}}" class="r" u-s="{{['head','body']}}" u-r="basicContainer" u-i="c23be978-0" bind:__l="__l" u-p="{{w}}"><view slot="head"><view class="hdtpnum"><view><view>订单总数</view><view>{{a}}</view></view><view><view>齐套数</view><view>{{b}}</view></view><view><view>自提件数</view><view>{{c}}</view></view><view><view>签收件数</view><view>{{d}}</view></view><view><view>库存品数</view><view>{{e}}</view></view></view><view class="scinp"><view>齐套状态</view><view><cus-selects wx:if="{{g}}" bindchange="{{f}}" u-i="c23be978-1,c23be978-0" bind:__l="__l" u-p="{{g}}"></cus-selects></view><view class="inputs"><input placeholder="请输入查询的订单号" value="{{h}}" bindinput="{{i}}"/></view><view class="btscan" bindtap="{{j}}">查询</view></view><view class="tabtip"><view bindtap="{{l}}"><view class="{{k}}">定制品</view></view><view bindtap="{{n}}"><view class="{{m}}">库存品</view></view><view bindtap="{{p}}"><view class="{{o}}">零担</view></view></view></view><scroll-view class="scve" scroll-y="true" slot="body"><view class="mabx"><block wx:for="{{q}}" wx:for-item="item" wx:key="s"><block wx:if="{{r}}"><view class="itec" bindtap="{{item.f}}"><view class="contenbx1"><view><text style="color:#90A0AF">订单编号：</text> {{item.a}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">计划数：</text>{{item.b}}</view><view><text style="color:#90A0AF">已扫码数：</text>{{item.c}}</view></view><view class="{{item.e}}">{{item.d}}</view></view></block><block wx:if="{{s}}"><view class="itec" bindtap="{{item.l}}"><view class="contenbx1"><view><text style="color:#90A0AF">SKU：</text>{{item.g}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">物品：</text>{{item.h}}</view><view><text style="color:#90A0AF">规格：</text>{{item.i}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">单位：</text>{{item.j}}</view><view><text style="color:#90A0AF">自提数：</text>{{item.k}}</view></view></view></block><block wx:if="{{t}}"><view class="itec" bindtap="{{item.r}}"><view class="contenbx1"><view><text style="color:#90A0AF">订单号：</text>{{item.m}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">运单号：</text>{{item.n}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">产品名称：</text>{{item.o}}</view></view><view class="contenbx1"><view><text style="color:#90A0AF">预计签收件数：</text>{{item.p}}</view><view><text style="color:#90A0AF">实际签收件数：</text>{{item.q}}</view></view></view></block></block></view></scroll-view></basic-container><tiplist class="r" u-r="tiplists" u-i="c23be978-2" bind:__l="__l"></tiplist>

unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js

@@ -95,7 +95,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         orderStatus: details.orderStatus,
         reservationId: details.reservationId,
         typeService: details.items.typeService,
-        stockupId: details.stockupId
+        stockupId: details.stockupId,
+        mallName: details.items.mallName
       };
       if (details.orderStatus === 3) {
         data.orderStatus = 1;
@@ -158,7 +159,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       console.log("_allocationList :>> ", _allocationList);
       if (_allocationList.length === 1) {
         return common_vendor.index.navigateTo({
-          url: "/pagesHome/pages/setbarcode/setbarcode?item=" + JSON.stringify(item) + "&reservationId=" + details.reservationId + "&goodsAreaName=" + details.user.goodsAreaName + "&stockupId=" + details.stockupId + "&allocationId=" + item.allocationList[0].id + "&positionCode=" + item.allocationList[0].name
+          url: "/pagesHome/pages/setbarcode/setbarcode?item=" + JSON.stringify(item) + "&reservationId=" + details.reservationId + "&goodsAreaName=" + details.user.goodsAreaName + "&stockupId=" + details.stockupId + "&allocationId=" + item.allocationList[0].id + "&positionCode=" + item.allocationList[0].name + "&mallName=" + details.items.mallName
         });
       }
       details.isChooseStorage = true;
@@ -183,7 +184,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           console.log("deta :>> ", deta);
           const _index = deta.checklist[0];
           common_vendor.index.navigateTo({
-            url: "/pagesHome/pages/setbarcode/setbarcode?item=" + JSON.stringify(item) + "&reservationId=" + details.reservationId + "&goodsAreaName=" + details.user.goodsAreaName + "&stockupId=" + details.stockupId + "&allocationId=" + item.allocationList[_index].id + "&positionCode=" + item.allocationList[_index].name
+            url: "/pagesHome/pages/setbarcode/setbarcode?item=" + JSON.stringify(item) + "&reservationId=" + details.reservationId + "&goodsAreaName=" + details.user.goodsAreaName + "&stockupId=" + details.stockupId + "&allocationId=" + item.allocationList[_index].id + "&positionCode=" + item.allocationList[_index].name + "&mallName=" + details.items.mallName
           });
           details.isChooseStorage = false;
           tiplists.value.setdetails({ isshow: false });

unpackage/dist/dev/mp-weixin/pagesHome/pages/pickingScan/pickingScan.js

@@ -129,7 +129,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       }
     }
     function gostockuplist(item) {
-      common_vendor.index.reLaunch({
+      common_vendor.index.navigateTo({
         url: "/pagesHome/pages/PickingScanList/PickingScanList?id=" + item.id + "&stockupArea=" + item.stockupArea
       });
     }

unpackage/dist/dev/mp-weixin/pagesHome/pages/setbarcode/setbarcode.js

@@ -42,7 +42,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       /** 新增包条数量 */
       packageNum: 0,
       /** 已扫数量 */
-      realityNum: 0
+      realityNum: 0,
+      mallName: ""
     });
     const tips = common_vendor.ref(null);
     const basicContainer = common_vendor.ref(null);
@@ -63,6 +64,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       details.goodsAreaName = op.goodsAreaName;
       details.allocationId = op.allocationId;
       details.positionCode = op.positionCode;
+      details.mallName = op.mallName;
       if (op.completeStact == "true") {
         details.completeStact = true;
       }

unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js

@@ -11,20 +11,28 @@ require("../../../config/host.js");
 require("../../../utils/md5.js");
 if (!Array) {
   const _easycom_u_navbar2 = common_vendor.resolveComponent("u-navbar");
+  const _easycom_uni_th2 = common_vendor.resolveComponent("uni-th");
+  const _easycom_uni_tr2 = common_vendor.resolveComponent("uni-tr");
+  const _easycom_uni_td2 = common_vendor.resolveComponent("uni-td");
+  const _easycom_uni_table2 = common_vendor.resolveComponent("uni-table");
   const _component_tips = common_vendor.resolveComponent("tips");
   const _component_tiplist = common_vendor.resolveComponent("tiplist");
-  (_easycom_u_navbar2 + _component_tips + _component_tiplist)();
+  (_easycom_u_navbar2 + _easycom_uni_th2 + _easycom_uni_tr2 + _easycom_uni_td2 + _easycom_uni_table2 + _component_tips + _component_tiplist)();
 }
 const _easycom_u_navbar = () => "../../../uni_modules/uview-plus/components/u-navbar/u-navbar.js";
+const _easycom_uni_th = () => "../../../uni_modules/uni-table/components/uni-th/uni-th.js";
+const _easycom_uni_tr = () => "../../../uni_modules/uni-table/components/uni-tr/uni-tr.js";
+const _easycom_uni_td = () => "../../../uni_modules/uni-table/components/uni-td/uni-td.js";
+const _easycom_uni_table = () => "../../../uni_modules/uni-table/components/uni-table/uni-table.js";
 if (!Math) {
-  (_easycom_u_navbar + cusSelects)();
+  (_easycom_u_navbar + cusSelects + _easycom_uni_th + _easycom_uni_tr + _easycom_uni_td + _easycom_uni_table)();
 }
 const cusSelects = () => "../../../compoment/cus-selects-fan/cus-selects-fan.js";
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "signOrderScan",
   setup(__props) {
     common_vendor.storeToRefs(store_useSystemSettingsStore.useSystemSettingsStore());
-    common_vendor.inject("utils");
+    const utils = common_vendor.inject("utils");
     let details = common_vendor.reactive({
       schanvalue: "",
       typearr: [
@@ -52,7 +60,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       deliveryId: "",
       orderType: "",
       inputtxt: "",
-      listcheckindex: -1
+      listcheckindex: -1,
+      scrollHeight: ""
     });
     const tiplists = common_vendor.ref(null);
     const tip = common_vendor.ref(null);
@@ -78,7 +87,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       });
       return num;
     });
-    common_vendor.onLoad((op) => {
+    common_vendor.onLoad(async (op) => {
       details.items = JSON.parse(op.item);
       details.id = JSON.parse(op.item).id;
       details.deliveryId = op.deliveryId;
@@ -101,6 +110,14 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           response.data.records.forEach((val) => {
             if (val.isZero === "1")
               return details.zeroArr.push(val);
+            val.abnormalSignature = 0;
+            val.abnormalLoading = 0;
+            val.distributionAppParcelListVOS.forEach((value) => {
+              if (value.isAbnnormalSigning === 1)
+                val.abnormalSignature += 1;
+              if (value.isAbnormalLoading === 1)
+                val.abnormalLoading += 1;
+            });
             details.orderArr.push(val);
           });
         let response1 = await api_user.signforinventory(data);
@@ -120,6 +137,13 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         console.log("err :>> ", err);
       }
     });
+    common_vendor.onMounted(async () => {
+      await common_vendor.nextTick$1();
+      utils.getViewDistanceFormTop(".scve").then((res) => {
+        console.log("res :>> ", res);
+        details.scrollHeight = res;
+      });
+    });
     function goorderdetail(item) {
       common_vendor.index.navigateTo({
         url: "/pagesHome/pages/orderDetails/orderDetails?orderCode=" + item.orderCode
@@ -262,6 +286,15 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         response.data.records.forEach((val) => {
           if (val.isZero === "1")
             return details.zeroArr.push(val);
+          val.abnormalSignature = 0;
+          val.abnormalLoading = 0;
+          val.distributionAppParcelListVOS.forEach((value) => {
+            if (value.isAbnnormalSigning === 1)
+              val.abnormalSignature += 1;
+            if (value.isAbnormalLoading === 1)
+              val.abnormalLoading += 1;
+          });
+          console.log("val :>> ", val);
           details.orderArr.push(val);
         });
       } else if (details.orderStatus == 3) {
@@ -418,50 +451,92 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             a: common_vendor.o(($event) => goorderdetail(item)),
             b: common_vendor.t(item.orderCode),
             c: common_vendor.t(item.reservationNum),
-            d: common_vendor.t(item.reservationNum),
+            d: common_vendor.t(item.loadingNub),
-            e: common_vendor.t(item.loadingNub),
+            e: common_vendor.t(item.signforNub),
-            f: common_vendor.t(item.signforNub),
+            f: common_vendor.t(item.reservationNum),
-            g: common_vendor.unref(listcheckindex) == index
+            g: common_vendor.t(item.abnormalLoading),
+            h: common_vendor.t(item.abnormalSignature),
+            i: common_vendor.unref(listcheckindex) == index
           }, common_vendor.unref(listcheckindex) == index ? {
-            h: common_vendor.f(item.distributionAppParcelListVOS, (ite, k1, i1) => {
+            j: "fb393026-4-" + i0 + "," + ("fb393026-3-" + i0),
+            k: common_vendor.p({
+              align: "left"
+            }),
+            l: "fb393026-5-" + i0 + "," + ("fb393026-3-" + i0),
+            m: common_vendor.p({
+              align: "left"
+            }),
+            n: "fb393026-6-" + i0 + "," + ("fb393026-3-" + i0),
+            o: common_vendor.p({
+              align: "left"
+            }),
+            p: "fb393026-7-" + i0 + "," + ("fb393026-3-" + i0),
+            q: common_vendor.p({
+              align: "center"
+            }),
+            r: "fb393026-3-" + i0 + "," + ("fb393026-2-" + i0),
+            s: common_vendor.f(item.distributionAppParcelListVOS, (ite, k1, i1) => {
               return {
                 a: common_vendor.t(ite.orderPackageCode),
-                b: common_vendor.t(ite.thirdProduct),
+                b: "fb393026-9-" + i0 + "-" + i1 + "," + ("fb393026-8-" + i0 + "-" + i1),
-                c: common_vendor.t(ite.orderPackageStatus === "70" ? "已扫" : "未扫")
+                c: common_vendor.t(ite.thirdProduct),
+                d: "fb393026-10-" + i0 + "-" + i1 + "," + ("fb393026-8-" + i0 + "-" + i1),
+                e: common_vendor.t(ite.orderPackageStatus === "70" ? "已扫" : "未扫"),
+                f: "fb393026-11-" + i0 + "-" + i1 + "," + ("fb393026-8-" + i0 + "-" + i1),
+                g: common_vendor.t(ite.isAbnnormalSigningName || ite.isAbnormalLoadingName || "/"),
+                h: "fb393026-12-" + i0 + "-" + i1 + "," + ("fb393026-8-" + i0 + "-" + i1),
+                i: Number(ite.isAbnormalLoading) === 1 || Number(ite.isAbnnormalSigning) === 1 ? 1 : "",
+                j: "fb393026-8-" + i0 + "-" + i1 + "," + ("fb393026-2-" + i0)
               };
+            }),
+            t: common_vendor.p({
+              align: "center"
+            }),
+            v: common_vendor.sr("uniTable1", "fb393026-2-" + i0, {
+              "f": 1
+            }),
+            w: common_vendor.o(() => {
+            }),
+            x: "fb393026-2-" + i0,
+            y: common_vendor.p({
+              border: true,
+              emptyText: "暂无更多数据"
             })
           } : {}, {
-            i: common_vendor.t(item.signforNub == 0 ? "未扫" : item.signforNub == item.reservationNum ? "齐套" : "部分扫"),
+            z: common_vendor.t(item.signforNub == 0 ? "未扫" : item.signforNub == item.reservationNum ? "齐套" : "部分扫"),
-            j: common_vendor.n(item.signforNub == 0 ? "tip tp2" : item.signforNub == item.reservationNum ? "tip tp1" : "tip tp3"),
+            A: common_vendor.n(item.signforNub == 0 ? "tip tp2" : item.signforNub == item.reservationNum ? "tip tp1" : "tip tp3"),
-            k: common_vendor.o(($event) => setcheckindex(index))
+            B: common_vendor.o(($event) => setcheckindex(index))
           }) : {}, common_vendor.unref(orderStatus) === 2 ? common_vendor.e({
-            l: common_vendor.o(($event) => goorderdetail(item)),
+            C: common_vendor.o(($event) => goorderdetail(item)),
-            m: common_vendor.t(item.orderCode),
+            D: common_vendor.t(item.orderCode),
-            n: common_vendor.o(($event) => goorderdetail(item)),
+            E: common_vendor.o(($event) => goorderdetail(item)),
-            o: common_vendor.t(item.descriptionGoods),
+            F: common_vendor.t(item.descriptionGoods),
-            p: common_vendor.t(item.reservationNum),
+            G: common_vendor.t(item.reservationNum),
-            q: common_vendor.t(item.loadingNub),
+            H: common_vendor.t(item.loadingNub),
-            r: item.complete
+            I: item.complete
           }, item.complete ? {
-            s: common_vendor.t(item.complete),
+            J: common_vendor.t(item.complete),
-            t: common_vendor.n(item.completecode == 3 ? "tip tp1" : item.completecode == 1 ? "tip tp2" : "tip tp3")
+            K: common_vendor.n(item.completecode == 3 ? "tip tp1" : item.completecode == 1 ? "tip tp2" : "tip tp3")
           } : {}, {
-            v: common_vendor.o(($event) => checkphon(item, index))
+            L: common_vendor.o(($event) => checkphon(item, index))
           }) : {}, common_vendor.unref(orderStatus) === 3 ? {
-            w: common_vendor.t(item.sku),
+            M: common_vendor.t(item.sku),
-            x: common_vendor.t(item.descriptionGoods),
+            N: common_vendor.t(item.descriptionGoods),
-            y: common_vendor.t(item.specification),
+            O: common_vendor.t(item.specification),
-            z: common_vendor.t(item.logpmUnit),
+            P: common_vendor.t(item.logpmUnit),
-            A: common_vendor.o(($event) => setcheckindex(index))
+            Q: common_vendor.o(($event) => setcheckindex(index))
           } : {});
         }),
         w: common_vendor.unref(orderStatus) === 1,
         x: common_vendor.unref(orderStatus) === 2,
         y: common_vendor.unref(orderStatus) === 3,
-        z: common_vendor.sr(tip, "fb393026-2", {
+        z: common_vendor.o(() => {
+        }),
+        A: common_vendor.unref(details).scrollHeight,
+        B: common_vendor.sr(tip, "fb393026-13", {
           "k": "tip"
         }),
-        A: common_vendor.sr(tiplists, "fb393026-3", {
+        C: common_vendor.sr(tiplists, "fb393026-14", {
           "k": "tiplists"
         })
       };

unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.wxss

@@ -36,6 +36,7 @@
   color: #FFFFFF;
 }
 .xialaxz.data-v-fb393026 {
+  zoom: 0.9;
   display: flex;
   flex-direction: column;
 }
@@ -232,4 +233,23 @@
   font-size: 32rpx;
   font-weight: 400;
   color: #FFFFFF;
+}
+.uni-table-scroll.data-v-fb393026 {
+  zoom: 0.9;
+}
+.uni-table-td.data-v-fb393026,
+.uni-table-th.data-v-fb393026 {
+  padding: 10rpx;
+}
+.active.data-v-fb393026 {
+  background-color: #ff4344;
+}
+.active view.data-v-fb393026 {
+  color: #fff;
+}
+.active td.data-v-fb393026 {
+  color: #fff;
+}
+.uni-table .active.data-v-fb393026:hover {
+  background: #ff4344 !important;
 }

unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.js

@@ -27,7 +27,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       title: "签收扫描",
       haveData: true,
       async pullDownRefreshInitPage() {
-        await init();
+        return await init();
       }
     };
     let details = common_vendor.reactive({
@@ -77,6 +77,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       }, 200);
     });
     async function init() {
+      details.datalist = [];
       details.current = 1;
       return await initpage();
     }
@@ -166,7 +167,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         m: common_vendor.o(init),
         n: common_vendor.f(common_vendor.unref(datalist), (item, k0, i0) => {
           return {
-            a: common_vendor.t(item == null ? void 0 : item.noteNumber),
+            a: common_vendor.t(item == null ? void 0 : item.trainNumber),
             b: common_vendor.t(item == null ? void 0 : item.type_name),
             c: common_vendor.t(item == null ? void 0 : item.deliStatus_name),
             d: common_vendor.t(item == null ? void 0 : item.vehicleName),

unpackage/dist/dev/mp-weixin/utils/base64.js

@@ -89,5 +89,5 @@ const Base64 = function() {
     return string;
   };
 };
-const base64 = new Base64();
+const Base64$1 = new Base64();
-exports.base64 = base64;
+exports.Base64 = Base64$1;

unpackage/dist/dev/mp-weixin/utils/functions.js

@@ -43,7 +43,7 @@ const api = {
       let header = {};
       let token = common_vendor.index.getStorageSync("access_token");
       header["Blade-Auth"] = `bearer ${token}`;
-      header.Authorization = `Basic ${utils_base64.base64.encode(config_host.APPKEY)}`;
+      header.Authorization = `Basic ${utils_base64.Base64.encode(config_host.APPKEY)}`;
       common_vendor.index.uploadFile({
         url: `${config_host.host}blade-resource/oss/endpoint/put-file`,
         filePath: file,

unpackage/dist/dev/mp-weixin/utils/request.js

@@ -73,7 +73,7 @@ const HandleRefreshToken = (header, urlhd, refresh_token, user) => {
   });
   return _isRefreshToken._isRefreshToken;
 };
-const HandleRequest = (params, key) => {
+const HandleRequest = (params, key, loadingObj) => {
   return new Promise(async (relove, reject) => {
     let refresh_token = common_vendor.index.getStorageSync("refresh_token");
     let token = common_vendor.index.getStorageSync("access_token");
@@ -89,13 +89,21 @@ const HandleRequest = (params, key) => {
       if (!token && params.url.indexOf("oauth/token") == -1)
         ;
     }
-    header.Authorization = `Basic ${utils_base64.base64.encode(config_host.APPKEY)}`;
+    header.Authorization = `Basic ${utils_base64.Base64.encode(config_host.APPKEY)}`;
     if (params.url.indexOf("blade-auth/oauth/token") != -1) {
       header["Content-Type"] = "application/x-www-form-urlencoded";
       header["Tenant-Id"] = params.data.tenantId;
       if (params.data.password)
         params.data.password = utils_md5.hexMD5(params.data.password);
     }
+    let content = "";
+    if (loadingObj.title)
+      content = loadingObj.title;
+    if (loadingObj.isShowLoading !== false)
+      common_vendor.index.showLoading({
+        title: content,
+        mask: true
+      });
     let urlhd = "";
     if (common_vendor.index.getStorageSync("setip")) {
       urlhd = common_vendor.index.getStorageSync("setip");
@@ -111,7 +119,6 @@ const HandleRequest = (params, key) => {
     const request = common_vendor.index.request(submitData);
     request.then((res) => {
       console.log("请求res :>> ", res);
-      common_vendor.index.hideLoading();
       if (res.statusCode == 200) {
         let data = res.data;
         if (data.code != 200 && (data == null ? void 0 : data.msg)) {
@@ -145,6 +152,7 @@ const HandleRequest = (params, key) => {
         } else if (res.statusCode == 500) {
           delete requestObj[key];
           utils_functions.api.error("接口出错，请联系后端开发人员");
+          relove({});
           return;
         } else if (res.statusCode == 401) {
           if (isLogin) {
@@ -155,7 +163,7 @@ const HandleRequest = (params, key) => {
           }
           if (_isRefreshToken._isRefreshToken) {
             _isRefreshToken._isRefreshToken.then(() => {
-              HandleRequest(requestObj[key], key).then((res2) => {
+              HandleRequest(requestObj[key], key, loadingObj).then((res2) => {
                 relove(res2);
               });
             });
@@ -163,7 +171,7 @@ const HandleRequest = (params, key) => {
             console.log("header :>> ", header);
             const refreshFn = HandleRefreshToken(header, urlhd, refresh_token, user);
             refreshFn.then((res2) => {
-              HandleRequest(requestObj[key], key).then((res3) => {
+              HandleRequest(requestObj[key], key, loadingObj).then((res3) => {
                 relove(res3);
               });
             }).catch(() => {
@@ -172,16 +180,20 @@ const HandleRequest = (params, key) => {
             });
           }
         } else {
+          console.log("111 :>> ", 111);
           delete requestObj[key];
           utils_functions.api.error("连接服务器失败");
+          reject(res);
         }
       }
-    }).catch((err) => {
+    }).catch(async (err) => {
       console.log(err);
       delete requestObj[key];
       utils_functions.api.error("请检查是否连接到无线网络");
+    }).finally(async (res) => {
+      await common_vendor.nextTick$1();
       common_vendor.index.hideLoading();
-    }).finally();
+    });
   });
 };
 let requestObj = {};
@@ -189,7 +201,7 @@ let _isRefreshToken = {
   _isRefreshToken: null
 };
 let isLogin = false;
-const service = async (params) => {
+const service = async (params, loadingObj) => {
   if (params.data.isLogin) {
     isLogin = true;
     delete params.data.isLogin;
@@ -205,8 +217,8 @@ const service = async (params) => {
   console.log("_isRefreshToken :>> ", _isRefreshToken);
   if (_isRefreshToken._isRefreshToken) {
     await _isRefreshToken._isRefreshToken;
-    return HandleRequest(params, _key);
+    return HandleRequest(params, _key, loadingObj);
   } else
-    return HandleRequest(params, _key);
+    return HandleRequest(params, _key, loadingObj);
 };
 exports.service = service;

unpackage/dist/dev/mp-weixin/utils/utils.js

@@ -70,6 +70,16 @@ const utils = {
         }
       });
     });
+  },
+  /**
+   * 提示
+   * @param {String} content 提示的文字
+   */
+  handleToast(content, icon = "none") {
+    common_vendor.index.showToast({
+      title: content,
+      icon
+    });
   }
 };
 exports.utils = utils;