快乐的梦鱼 недель назад: 2
Родитель
Сommit
b71ac37d22

+ 1 - 5
src/pages/collect/assessment/argeement-sign.vue

@@ -3,12 +3,8 @@
 </template>
 
 <script setup lang="ts">
-import { useLoadQuerys } from '@/common/composeabe/LoadQuerys';
 import { useWebPageUrl } from './composeabe/WebPageUrl';
 
-const { querys } = useLoadQuerys({
-  id: number
-})
+const { src } = useWebPageUrl('/collect/assessment/argeement-sign')
 
-const { src } = useWebPageUrl('/collect/assessment/argeement-sign?id=38&userId=134')
 </script>

+ 3 - 3
src/pages/collect/assessment/composeabe/WebPageUrl.ts

@@ -1,9 +1,9 @@
 import { useAuthStore } from "@/store/auth";
-import { computed } from "vue";
+import { computed, type Ref } from "vue";
 
 const WEB_URL = 'https://zycj.wenlvti.net';
 
-export function useWebPageUrl(subPath: string) {
+export function useWebPageUrl(subPath: Ref<string>|string) {
 
   const authStore = useAuthStore();
 
@@ -15,7 +15,7 @@ export function useWebPageUrl(subPath: string) {
       userInfo: authStore.userInfo,
       loginType: authStore.loginType,
     };
-    return WEB_URL + `?inMiniProgram=true&directAuthInfo=${encodeURIComponent(JSON.stringify(authInfo))}#${subPath}`
+    return WEB_URL + `?inMiniProgram=true&directAuthInfo=${encodeURIComponent(JSON.stringify(authInfo))}#${typeof subPath === 'string' ? subPath : subPath.value || ''}`
   });
 
   return {