mo 2 년 전
부모
커밋
bd7622e06b
2개의 변경된 파일14개의 추가작업 그리고 19개의 파일을 삭제
  1. 8 17
      src/helpers/native-message.ts
  2. 6 2
      src/school/attendance/components/teacher-attendDetail.tsx

+ 8 - 17
src/helpers/native-message.ts

@@ -27,21 +27,17 @@ window.postMessage = (message: IPostMessage) => {
 type CallBack = (evt?: IPostMessage) => void
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function
-const loop = () => { }
+const loop = () => {}
 
 const calls: { [key: string]: CallBack | CallBack[] } = {}
 
 const browserInfo = browser()
 
 if (browserInfo.isApp) {
-  window.addEventListener('message', evt => {
+  window.addEventListener('message', (evt) => {
     try {
       console.log('message', evt.data)
-      const data = evt.data
-        ? typeof evt.data === 'object'
-          ? evt.data
-          : JSON.parse(evt.data)
-        : {}
+      const data = evt.data ? (typeof evt.data === 'object' ? evt.data : JSON.parse(evt.data)) : {}
       const uuid = data.content?.uuid || data.uuid
       // console.log(uuid, data.content, 'uuid')
       try {
@@ -55,9 +51,7 @@ if (browserInfo.isApp) {
         // console.log('data', data)
       }
       if (!uuid) {
-        const keys = Object.keys(calls).filter(
-          key => key.indexOf(data.api) === 0
-        )
+        const keys = Object.keys(calls).filter((key) => key.indexOf(data.api) === 0)
         // console.log(keys, 'keys')
         // console.log(data, 'data')
         for (const key of keys) {
@@ -85,7 +79,6 @@ export const postMessage = (data: IPostMessage, callback?: CallBack) => {
     calls[uuid] = callback || loop
     data.content = data.content ? { ...data.content, uuid } : { uuid }
     instance.postMessage(JSON.stringify(data))
-    console.log('send:', JSON.stringify(data))
   }
 }
 
@@ -111,15 +104,13 @@ export const removeListenerMessage = (api: string, callback: CallBack) => {
     const uuid = api
     if (Array.isArray(calls[uuid])) {
       const indexOf = (calls[uuid] as CallBack[]).indexOf(callback)
-        ; (calls[uuid] as CallBack[]).splice(indexOf, 1)
+      ;(calls[uuid] as CallBack[]).splice(indexOf, 1)
     }
   }
 }
 
-export const promisefiyPostMessage = (
-  data: IPostMessage
-): Promise<IPostMessage | undefined> => {
-  return new Promise(resolve => {
-    postMessage(data, res => resolve(res))
+export const promisefiyPostMessage = (data: IPostMessage): Promise<IPostMessage | undefined> => {
+  return new Promise((resolve) => {
+    postMessage(data, (res) => resolve(res))
   })
 }

+ 6 - 2
src/school/attendance/components/teacher-attendDetail.tsx

@@ -58,7 +58,7 @@ export default defineComponent({
         })
         closeSheet()
       } catch (e) {
-        showToast('发起聊天失败')
+        showToast('拨号失败')
         closeSheet()
       }
     }
@@ -83,6 +83,10 @@ export default defineComponent({
     })
 
     const setAddress = async (myPoint: string) => {
+      if (!myPoint) {
+        showToast('当前暂无定位')
+        return
+      }
       console.log(myPoint, attendanceScope.value)
       try {
         await postMessage({
@@ -90,7 +94,7 @@ export default defineComponent({
           content: {
             type: 'display',
             orginPoint: teacherAttInfo.value.addressLongitudeLatitude,
-            myPoint,
+            myPoint: myPoint,
             limitDistance: attendanceScope.value
           }
         })