From 5ec7af93dd78de00d720dfefd96a6d7c4fa6a0b4 Mon Sep 17 00:00:00 2001
From: jyx <2012969435@qq.com>
Date: Tue, 3 Dec 2024 10:51:41 +0800
Subject: [PATCH] =?UTF-8?q?freebox=20=E5=8A=A0=E4=B8=A4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/index.vue    | 9 ++++++---
 src/pages/painting/index.vue | 7 ++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index d1a3eef..137dcf1 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -110,12 +110,14 @@ const state = reactive({
   id: "",
   pid: "",
   code: "",
+  drawUid:"",
 });
 const { showMessage } = useToast();
 const loading = ref(false);
 const isCode = ref(false);
 const haveCode = ref(false);
 onLoad((options) => {
+  console.log("1111",options)
   if (options.id && options.pid) {
     state.id = options.id;
     state.pid = options.pid;
@@ -151,10 +153,11 @@ const paintingDetail = async () => {
   });
   if (res.status === 0) {
     state.boxRelBucketStatus = res.data.boxRelBucketStatus;
-    console.log("boxRelBucketStatus", state.boxRelBucketStatus);
+    state.drawUid = res.data.drawUid;
+    console.log("drawUid", state.drawUid);
     if (res.data.pbStatus == 1) {
       uni.redirectTo({
-        url: "/pages/index/index?id=" + state.id + "&pid=" + state.pid,
+        url: "/pages/index/index?id=" + state.id + "&pid=" + state.pid ,
         success: () => {
           loading.value = false;
         },
@@ -169,7 +172,7 @@ const paintingDetail = async () => {
         res.data.locateAddress == "公司内"
       ) {
         uni.redirectTo({
-          url: "/pages/painting/index?id=" + state.id + "&pid=" + state.pid,
+          url: "/pages/painting/index?id=" + state.id + "&pid=" + state.pid+ "&drawUid=" + state.drawUid,
           success: () => {
             loading.value = false;
           },
diff --git a/src/pages/painting/index.vue b/src/pages/painting/index.vue
index 19256b9..2260a27 100644
--- a/src/pages/painting/index.vue
+++ b/src/pages/painting/index.vue
@@ -67,6 +67,7 @@ const state = reactive({
   boxName: "",
   boxUid: "",
   containerUid: "",
+  drawUid:"",
 });
 onLoad((options) => {
   if (window.plus) {
@@ -82,13 +83,17 @@ onLoad((options) => {
   }
   state.id = options.id;
   state.pid = options.pid;
+  state.drawUid = options.drawUid;
   bindShelfHole();
   getBtngetRules();
 });
 
 const bindShelfHole = async () => {
   loading.value = true;
-  const res = await freebox();
+  const res = await freebox({
+    ptId:Number(state.id),
+    drawUid:state.drawUid,
+  });
   if (res.status === 0) {
     state.containerName = res.data.containerName;
     state.boxName = res.data.boxName;