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

pages/adminHome/index.vue

@@ -10,12 +10,12 @@
       <view class="card">
         <view class="card-item">
           <view class="item-title">区域数量 </view>
-          <view class="item-totel">{{ form.areaCount }} </view>
+            <view class="item-totel">{{ form.regionCount }} </view>
           <image class="card-img" style="width: 130rpx; height: 130rpx" src="/static/adminImg/card1.png"></image>
         </view>
         <view class="card-item">
           <view class="item-title">子区域数量 </view>
-          <view class="item-totel">{{ form.regionCount }} </view>
+          <view class="item-totel">{{ form.areaCount }} </view>
           <image class="card-img" style="width: 130rpx; height: 130rpx" src="/static/adminImg/card2.png"></image>
         </view>
         <view class="card-item">

utils/request.js

@@ -34,13 +34,49 @@ const baseRequest = async (url, method, data = {}, loading = true) => {
         manager.deleteById(requestId);
       },
       success: (successData) => {
-        //console.log(successData)
+        console.log(successData, 'successData')
         const res = successData.data;
         if (successData.statusCode == 200) {
+          console.log(res, "请求成功---");
           // 业务逻辑，自行修改，401是服务器上返回该token过期，过期后跳转到登陆页面
           if (res.code > 400) {
             clearStorageSync("token");
             useRouter(systemConfig.login_page, "reLaunch");
+          } else if (res.Data === 401) {
+            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: "logout",
+                      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;
           } else {
             reslove(res);
           }