Forráskód Böngészése

fix: 修改需求,更改对接方

bill 2 éve
szülő
commit
5eaf7c6e66

+ 2 - 9
src/api/instance.ts

@@ -2,7 +2,7 @@ import { axiosFactory } from './setup'
 import { message } from 'ant-design-vue'
 import { showLoading, hideLoading } from '@/components/loading'
 import { ResCode, ResCodeDesc } from './constant'
-import { baseURL, token } from '@/env'
+import { baseURL, token, mainURL } from '@/env'
 
 const instance = axiosFactory()
 
@@ -24,15 +24,8 @@ export const {
 } = instance
 
 export const gotoLogin = () => {
-  const loginHref = import.meta.env.DEV
-    ? 'https://test.4dkankan.com'
-    : 'https://www.4dkankan.com'
-
   location.replace(
-    'https://test.4dkankan.com' +
-      '?redirect=' +
-      escape(location.href) +
-      '#/login/login'
+    mainURL + '/?redirect=' + escape(location.href) + '#/login/login'
   )
 }
 

+ 2 - 0
src/env/index.ts

@@ -9,3 +9,5 @@ export const baseURL = import.meta.env.DEV
   ? '/api'
   : 'https://v4-test.4dkankan.com'
 export const token = params.token
+
+export const mainURL = import.meta.env.DEV ? 'https://test.4dkankan.com' : '/'

+ 10 - 5
src/layout/header.vue

@@ -18,7 +18,7 @@
             </template>
           </a-avatar>
           <span>
-            {{ userStore.current.phone }}
+            {{ userStore.current.nickname }}
             <DownOutlined />
           </span>
         </div>
@@ -30,7 +30,8 @@
 <script lang="ts" setup>
 import { MenuProps } from 'ant-design-vue'
 import { useUserStore } from '@/store'
-import { gotoLogin, postLogout } from '@/api'
+import { postLogout } from '@/api'
+import { mainURL } from '@/env'
 import logoPng from '@/assets/images/logo.png'
 
 defineOptions({ name: 'LayoutHeader' })
@@ -38,12 +39,16 @@ defineOptions({ name: 'LayoutHeader' })
 const userStore = useUserStore()
 userStore.fetch()
 
-const menus = [{ label: '退出', key: 'logout' }]
+const menus = [
+  { label: '个人中心', key: 'user' },
+  { label: '退出', key: 'logout' }
+]
 const handlerMenuClick: MenuProps['onClick'] = async e => {
   await postLogout()
   if (e.key === 'logout') {
-    location.replace('https://test.4dkankan.com/')
-    // gotoLogin()
+    location.replace(mainURL)
+  } else {
+    location.href = `${mainURL}/#/information`
   }
 }
 </script>

+ 2 - 2
src/store/room.ts

@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 import { TemplateId } from './constant'
 import { useUserStore } from './user'
+import { mainURL } from '@/env'
 import {
   fetchRomms,
   fetchRoomMiniCode,
@@ -45,8 +46,7 @@ export const useRoomStore = defineStore('room', {
       () =>
       <T extends Pick<Room, 'scenes'>>(room: T) =>
         room.scenes.map(scene => scene.num),
-    getShareUrl: () => (room: Room) =>
-      `https://test.4dkankan.com?roomId=${room.id}`,
+    getShareUrl: () => (room: Room) => `${mainURL}?roomId=${room.id}`,
     filter: state => (keyowrd: string) =>
       state.list.filter(room => room.title.includes(keyowrd))
   },

+ 3 - 1
src/views/room/edit-room/index.vue

@@ -32,7 +32,7 @@
       <div class="scene">
         <iframe
           v-if="current.scenes.length"
-          :src="`https://test.4dkankan.com/smg.html?m=${current.scenes[0].num}&mobile=true`"
+          :src="`${mainURL}/smg.html?m=${current.scenes[0].num}&mobile=true`"
           frameborder="0"
         />
         <img v-else :src="unScenePng" />
@@ -102,6 +102,7 @@ import { ref, defineComponent, reactive } from 'vue'
 import { createRoom, useRoomStore } from '@/store'
 import { props } from './props'
 import { message } from 'ant-design-vue'
+import { mainURL } from '@/env'
 import EditScenes from './scene-list.vue'
 import unScenePng from '@/assets/images/un-scene.png'
 
@@ -144,6 +145,7 @@ export default defineComponent({
       deleteScene,
       saveRoom,
       startSync,
+      mainURL,
       unScenePng
     }
   }