Merge branch 'main' of http://sl.vrgon.com:3000/LuYaShi/InspectionCleaning

App.vue

@@ -63,24 +63,23 @@ export default {
   onHide: function () {},
   methods: {
     initFn(data) {
-      // uni.hideLoading(); // 关闭 Loading
+      if (!data) {
+        return uni.showToast({ title: "未传入参数 initFn", icon: "none" });
+      }
       // uni.showModal({
-      //   title: '查看initFn',
-      //   content: data || '未传入参数 initFn',
+      //   title: "查看initFn",
+      //   content: JSON.stringify(data) || "未传入参数 initFn",
       //   showCancel: true,
       //   success: function (res) {},
       // });
-      console.log("%c%s", "color:red", "init");
-      console.log(data, "data--");
-      uni.setStorageSync(
-        "token",
-        "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9zaWQiOiIwOGRkNzFiZC01N2MxLTQ1YmMtODBiYS0xMjkzYjU4MTViMmEiLCJ1bmlxdWVfbmFtZSI6IuS_nea0gSIsInJvbGUiOiJVc2VyIiwiaHR0cDovL3NjaGVtYXMueG1sc29hcC5vcmcvd3MvMjAwNS8wNS9pZGVudGl0eS9jbGFpbXMvbW9iaWxlcGhvbmUiOiIxODE3NDAxMDU2MiIsImdyb3Vwc2lkIjoiNGIyZDk2NjItYTc2OC0wOGYyLWEwYzgtNzYyYjhjNzZkYTJhIiwibmJmIjoxNzQ0MjYzMTAyLCJleHAiOjE3NDQyNjY3MDIsImlhdCI6MTc0NDI2MzEwMn0.ZJTwC7rWCcywoM7ncysw-JRIiwXz4y_6hlmqctN-gMM"
-      );
-
+      //   "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9zaWQiOiIwOGRkNzFiZC01N2MxLTQ1YmMtODBiYS0xMjkzYjU4MTViMmEiLCJ1bmlxdWVfbmFtZSI6IuS_nea0gSIsInJvbGUiOiJVc2VyIiwiaHR0cDovL3NjaGVtYXMueG1sc29hcC5vcmcvd3MvMjAwNS8wNS9pZGVudGl0eS9jbGFpbXMvbW9iaWxlcGhvbmUiOiIxODE3NDAxMDU2MiIsImdyb3Vwc2lkIjoiNGIyZDk2NjItYTc2OC0wOGYyLWEwYzgtNzYyYjhjNzZkYTJhIiwibmJmIjoxNzQ0MjYzMTAyLCJleHAiOjE3NDQyNjY3MDIsImlhdCI6MTc0NDI2MzEwMn0.ZJTwC7rWCcywoM7ncysw-JRIiwXz4y_6hlmqctN-gMM"
+      let token = data.token;
+      uni.setStorageSync("token", "Bearer " + token);
       uni.switchTab({
         url: "/pages/index/index",
         success() {
           console.log("跳转成功");
+          window.initFn = null; // 清除全局函数
         },
         fail(err) {
           console.error("跳转失败", err);

api/env.js

@@ -5,7 +5,7 @@ if (process.env.NODE_ENV === 'development') {
   BASE_URL = 'http://10.30.2.228:8556'  //开发环境请求地址
 } else {
   // 生产环境
-  BASE_URL = 'https://mock.apifox.cn/m1/3553664-0-default'  //生成环境请求地址
+  BASE_URL = 'http://10.30.2.228:8556'  //生成环境请求地址
 }
  
 export default BASE_URL

pages/home/index.vue

@@ -2,25 +2,21 @@
   <view class="content"> </view>
 </template>
 <script>
-import { useRouter } from "@/utils/utils.js";
-import daySelect from "@/components/daySelect/index.vue";
 export default {
-  components: {
-    daySelect,
-  },
   data() {
-    return {
-    };
+    return {};
   },
   mounted() {
     // console.log("%c%s", "color:red", "mounted--");
   },
+  onLoad() {},
   methods: {},
 };
 </script>
 <style lang="scss" scoped>
 .content {
-  // height: 100vh; // 确保容器有明确高度
+  height: 100vh; // 确保容器有明确高度
+  // background-color: skyblue;
   overflow: hidden;
   padding-bottom: 100rpx;
 }

utils/request.js

@@ -45,6 +45,41 @@ const baseRequest = async (url, method, data = {}, loading = true) => {
             reslove(res);
           }
         } else {
+          if(successData.statusCode === 401){
+            console.log(successData,'successData--')
+            console.log('%c%s', 'color:red', '登录过期')
+            uni.showModal({
+              title: "提示",
+              content: "登陆过期,请重新登陆",
+              showCancel: false,
+              success: function (res) {
+                let u = navigator.userAgent;
+                let isAndroid = u.indexOf("Android") > -1 || u.indexOf("Adr") > -1; //android
+                // let isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios
+                try {
+                  if (isAndroid && AndroidJs) {
+                    console.log("%c%s", "color:red", "安卓--调用返回方法");
+                    const reqRow = {
+                      name: "back-android",
+                      data: "",
+                    };
+                    AndroidJs.func(JSON.stringify(reqRow)); // 给安卓传参
+                  } else {
+                    console.log("%c%s", "color:red", "苹果--调用返回方法");
+                    const reqRow = {
+                      name: "back-iphone",
+                      data: "",
+                    };
+                    window.webkit.messageHandlers.func.postMessage(JSON.stringify(reqRow)); // 给ios 传参
+                  }
+                } catch (e) {
+                  console.log(e, "e-----判断安卓苹果类型出错");
+                }
+              },
+            });
+            reject(res);
+            return
+          }
           console.log("网络连接失败，请稍后重试", url);
           toast("网络连接失败，请稍后重试");
           reject(res);