合并

dist/index.html

@@ -26,7 +26,11 @@
   <script src="./flexible.js"></script>
   <script src="./abc2svg/xml2abc.js"></script>
   <script src="./abc2svg/jquery-1.11.1.min.js"></script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-f0a8bc3b.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index-1d461e0e.js"></script>
+>>>>>>> iteration-20240730
   <link rel="stylesheet" href="./assets/index-77819ea9.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
@@ -37,7 +41,11 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-a19b005e.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-bc62a860.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-b0d3ddcd.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240730
 </body>
 
 </html>

src/pc/App.tsx

@@ -7,6 +7,7 @@ import { studentQueryUserInfo, teacherQueryUserInfo } from "./api";
 import { GlobalThemeOverrides, NConfigProvider, NDialogProvider, NMessageProvider, NNotificationProvider, darkTheme } from "naive-ui";
 import { browser, lighten, setToken } from "../utils";
 import { showToast } from "vant";
+import { eventGlobal } from "./component/upload-to-tasks/state";
 
 export default defineComponent({
   name: "App",
@@ -57,6 +58,18 @@ export default defineComponent({
           event.preventDefault();
         }
       });
+
+      // auth-not-installed
+      // 判断是否显示证书提示
+      eventGlobal.on("auth-not-installed", () => {
+        // 判断是否在应用中
+        window.parent.postMessage(
+          {
+            api: "onAuthNotInstalled",
+          },
+          "*"
+        );
+      });
     });
 
     const inited = computed(() => {

src/utils/request.ts

@@ -5,6 +5,7 @@ import whiteUrl from "../constant/whiteUrl";
 import { storeData } from "../store";
 import { browser, getToken } from ".";
 import { postMessage } from "./native-message";
+import { eventGlobal } from "../pc/component/upload-to-tasks/state";
 
 const apiRouter = whiteUrl();
 const browserInfo = browser();
@@ -51,6 +52,12 @@ request.interceptors.response.use(
       throw new Error(msg);
     }
     const data = await res.clone().json();
+    if (res.status > 299 || res.status < 200) {
+      // 判断是否有资源需要证书，不提示错误信息
+      if (res.status === 511) {
+        eventGlobal.emit('auth-not-installed');
+      }
+    }
     if (data.code === 5000) {
       // 判断是否在应用中
       window.parent.postMessage(