Browse Source

国际服配置

gemercheung 2 years ago
parent
commit
0ea4caf4dd
7 changed files with 30 additions and 13 deletions
  1. 3 2
      .env
  2. 2 1
      .env.eur
  3. 2 1
      .env.production
  4. 2 0
      src/env/index.ts
  5. 7 2
      src/store/room.ts
  6. 8 1
      src/views/room/list.vue
  7. 6 6
      src/views/room/sign.vue

+ 3 - 2
.env

@@ -1,2 +1,3 @@
-VITE_BASE_API_URL=/api
-VITE_MAIN_URL=https://test.4dkankan.com
+VITE_BASE_API_URL=https://testeur.4dkankan.com
+VITE_MAIN_URL=https://testeur.4dkankan.com
+VITE_LIVE_STEAM_URL=https://testeur.4dkankan.com/livestream

+ 2 - 1
.env.eur

@@ -1,2 +1,3 @@
 VITE_BASE_API_URL=https://testeur.4dkankan.com
-VITE_MAIN_URL=''
+VITE_MAIN_URL=https://testeur.4dkankan.com
+VITE_LIVE_STEAM_URL=https://testeur.4dkankan.com/livestream

+ 2 - 1
.env.production

@@ -1,2 +1,3 @@
 VITE_BASE_API_URL=https://v4-test.4dkankan.com
-VITE_MAIN_URL=''
+VITE_MAIN_URL=https://testeur.4dkankan.com/livestream
+VITE_LIVE_STEAM_URL=https://v4-test.4dkankan.com

+ 2 - 0
src/env/index.ts

@@ -15,3 +15,5 @@ export const baseURL = import.meta.env.VITE_BASE_API_URL
 export const token = params.token
 
 export const mainURL = import.meta.env.VITE_MAIN_URL
+
+export const liveStreamURL = import.meta.env.VITE_LIVE_STEAM_URL

+ 7 - 2
src/store/room.ts

@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import { TemplateId } from './constant'
 import { useUserStore } from './user'
-import { mainURL } from '@/env'
+import { mainURL,liveStreamURL } from '@/env'
 import {
   fetchRomms,
   fetchRoomMiniCode,
@@ -46,7 +46,12 @@ export const useRoomStore = defineStore('room', {
       () =>
       <T extends Pick<Room, 'scenes'>>(room: T) =>
         room.scenes.map(scene => scene.num),
-    getShareUrl: () => (room: Room) => `${mainURL}?roomId=${room.id}`,
+    getShareUrl: () => (room: Room, m?: string) => {
+      // m=${scene}
+      return m
+        ? `${liveStreamURL}?m=${m}&roomId=roomId_${room.id}`
+        : `${liveStreamURL}?&roomId=roomId_${room.id}`
+    },
     filter: state => (keyowrd: string) =>
       state.list.filter(room => room.title.includes(keyowrd))
   },

+ 8 - 1
src/views/room/list.vue

@@ -76,6 +76,7 @@ import MiniSync from './modal/mini-sync.vue'
 import DataList from '@/components/data-list/index.vue'
 
 import type { Room } from '@/store'
+import { fetchRoomScenes } from '@/api'
 
 defineOptions({ name: 'RoomList' })
 
@@ -134,7 +135,13 @@ const miniSyncRoom = async (room: Room, key?: 'leader') => {
     descs
   })
 }
-const webSyncRoom = (room: Room) => window.open(roomStore.getShareUrl(room))
+const webSyncRoom = async (room: Room) => {
+  // debugger
+  const scenes = await fetchRoomScenes(room.id)
+  const m = scenes[0].num
+  console.log('带看link', roomStore.getShareUrl(room, m))
+  window.open(roomStore.getShareUrl(room, m), '_blank')
+}
 
 const editRoom = async (room?: Room) => {
   if (room) {

+ 6 - 6
src/views/room/sign.vue

@@ -4,16 +4,16 @@
       <div class="room-cover">
         <img alt="example" :src="room.cover" />
         <div class="action">
-          <a-button
+          <!-- <a-button
             class="botton"
             shape="round"
             type="ghost"
             size="large"
-            @click="$emit('webSync')"
+            @click="$emit('miniSync')"
           >
-            网页带看
-          </a-button>
-          <!-- <a-button
+            小程序带看
+          </a-button> -->
+          <a-button
             class="botton"
             shape="round"
             type="ghost"
@@ -21,7 +21,7 @@
             @click="$emit('webSync')"
           >
             网页带看
-          </a-button> -->
+          </a-button>
           <div class="more">
             <span style="--hover-color: #0076f6" @click="$emit('edit')">
               <i class="iconfont icon-works_editor" />编辑