From b3ed9f2b8d2369df3481765f8bafaedc8fb62ae5 Mon Sep 17 00:00:00 2001
From: xuminyui <576362016@qq.com>
Date: Thu, 24 Oct 2024 15:26:16 +0800
Subject: [PATCH] fix

---
 src/App.vue | 132 ++++++++++++++++++++++++++--------------------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 0b72a76..3352c54 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -16,74 +16,74 @@ export default {
     // const token = window?.plus?.storage.getItem("token");
     // uni.setStorageSync("token", token);
     // console.log("App Show", uni.getStorageSync("token"));
-    // const params = new URLSearchParams(window.location.search); //属性包含当前 URL 的查询字符串部分
-    // state.id = params.get("id");
-    // state.pid = params.get("pid");
-    // console.log(state);
+    const params = new URLSearchParams(window.location.search); //属性包含当前 URL 的查询字符串部分
+    state.id = params.get("id");
+    state.pid = params.get("pid");
+    console.log(state);
 
-    // const paintingDetail = async () => {
-    //   loading.value = true;
-    //   console.log("state", state);
-    //   const res = await pbDetail({
-    //     id: state.id,
-    //     pid: state.pid,
-    //   });
-    //   if (res.status === 0) {
-    //     console.log("成功拉1");
-    //     state.boxRelBucketStatus = res.data.boxRelBucketStatus;
-    //     console.log("boxRelBucketStatus", state.boxRelBucketStatus);
-    //     if (res.data.pbStatus == 1) {
-    //       console.log("成功拉2");
-    //       uni.navigateTo({
-    //         url: "/pages/index/index?id=" + state.id + "&pid=" + state.pid,
-    //         success: () => {
-    //           loading.value = false;
-    //         },
-    //         fail: () => {
-    //           loading.value = false;
-    //           showMessage({ type: "default", message: "跳转失败" });
-    //         },
-    //       });
-    //     } else {
-    //       if (
-    //         res.data.boxRelBucketStatus == 3 &&
-    //         res.data.locateAddress == "公司内"
-    //       ) {
-    //         uni.navigateTo({
-    //           url: "/pages/painting/index?id=" + state.id + "&pid=" + state.pid,
-    //           success: () => {
-    //             loading.value = false;
-    //           },
-    //           fail: () => {
-    //             loading.value = false;
-    //             showMessage({ type: "default", message: "跳转失败" });
-    //           },
-    //         });
-    //       } else {
-    //         uni.setStorageSync("data", res.data);
-    //         console.log();
-    //         uni.navigateTo({
-    //           url:
-    //             "/pages/detail/index?id=" +
-    //             state.id +
-    //             "&pid=" +
-    //             state.pid +
-    //             "&boxRelBucketStatus=" +
-    //             state.boxRelBucketStatus,
+    const paintingDetail = async () => {
+      loading.value = true;
+      console.log("state", state);
+      const res = await pbDetail({
+        id: state.id,
+        pid: state.pid,
+      });
+      if (res.status === 0) {
+        console.log("成功拉1");
+        state.boxRelBucketStatus = res.data.boxRelBucketStatus;
+        console.log("boxRelBucketStatus", state.boxRelBucketStatus);
+        if (res.data.pbStatus == 1) {
+          console.log("成功拉2");
+          uni.navigateTo({
+            url: "/pages/index/index?id=" + state.id + "&pid=" + state.pid,
+            success: () => {
+              loading.value = false;
+            },
+            fail: () => {
+              loading.value = false;
+              showMessage({ type: "default", message: "跳转失败" });
+            },
+          });
+        } else {
+          if (
+            res.data.boxRelBucketStatus == 3 &&
+            res.data.locateAddress == "公司内"
+          ) {
+            uni.navigateTo({
+              url: "/pages/painting/index?id=" + state.id + "&pid=" + state.pid,
+              success: () => {
+                loading.value = false;
+              },
+              fail: () => {
+                loading.value = false;
+                showMessage({ type: "default", message: "跳转失败" });
+              },
+            });
+          } else {
+            uni.setStorageSync("data", res.data);
+            console.log();
+            uni.navigateTo({
+              url:
+                "/pages/detail/index?id=" +
+                state.id +
+                "&pid=" +
+                state.pid +
+                "&boxRelBucketStatus=" +
+                state.boxRelBucketStatus,
 
-    //           success: () => {
-    //             loading.value = false;
-    //           },
-    //           fail: () => {
-    //             loading.value = false;
-    //             showMessage({ type: "default", message: "跳转失败" });
-    //           },
-    //         });
-    //       }
-    //     }
-    //   }
-    // };
-    // paintingDetail();
+              success: () => {
+                loading.value = false;
+              },
+              fail: () => {
+                loading.value = false;
+                showMessage({ type: "default", message: "跳转失败" });
+              },
+            });
+          }
+        }
+      }
+    };
+    paintingDetail();
   },
   onHide: function () {
     console.log("App Hide");