gemercheung hace 2 años
padre
commit
6fcc37e0e2

+ 1 - 1
.env.development

@@ -4,7 +4,7 @@ VITE_APP_RESOURCE_URL=https://4dkk.4dage.com/
 # 静态资源地址
 VITE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
 # sdk文件地址
-VITE_APP_SDK_DIR=https://4dkk.4dage.com/v4/sdk/4.2.1
+VITE_APP_SDK_DIR=https://4dkk.4dage.com/v4/www/sdk
 # socket地址
 VITE_APP_SOCKET_URL=wss://ws.4dkankan.com
 # 静态资源目录

+ 1 - 1
.env.eur

@@ -5,7 +5,7 @@ VITE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
 # sdk文件地址
 VITE_APP_SDK_DIR=https://testeurs3.4dkankan.com/v4/www/sdk
 # socket地址
-VITE_APP_SOCKET_URL=wss://ws.4dkankan.com
+VITE_APP_SOCKET_URL=wss://ws.gemer.xyz
 # VITE_APP_SOCKET_URL=wss://testeurws.4dkankan.com
 # VITE_APP_SOCKET_URL=wss://221.4.210.172:16666
 # 静态资源目录

+ 1 - 0
package.json

@@ -5,6 +5,7 @@
   "scripts": {
     "dev": "vite",
     "dev-eur": "vite --mode eur",
+    "build-eur": "vue-tsc  --noEmit && vite build --mode eur",
     "build": "vue-tsc  --noEmit && vite build --mode production",
     "commit": "git add . && git cz",
     "preview": "vite preview",

+ 4 - 1
src/components/chatRoom/controls/actions.ts

@@ -95,7 +95,10 @@ async function handleUserInit() {
   const rtcStore = useRtcStore();
   if (rtcStore.role === 'leader') {
     const app = await useApp();
-    app.Connect.follow.sync();
+    setTimeout(() => {
+      app.Connect.follow.sync();
+    }, 300);
+
     // setTimeout(() => {
     //     socket.value.emit("action", {
     //       type: "leader-avatar",

+ 8 - 4
src/components/chatRoom/index.vue

@@ -10,11 +10,15 @@
     <!-- 当前人数 end -->
     <!-- 控制条 start -->
     <div class="controlBar" v-if="!showInput">
-      <div class="saySomething" @click="onFocus" :class="{ disabled: !inputStatus }">
+      <div
+        class="saySomething"
+        @click="onFocus"
+        :class="{ disabled: !inputStatus && !isNativeLeader }"
+      >
         <!-- <i class="speakIcon"
            :class="{'dis':!user_info.IsWords}"></i> -->
-        <span v-if="inputStatus">{{ t('base.saySomething') }}</span>
-        <span v-else>已被禁言</span>
+        <span v-if="inputStatus || isNativeLeader">{{ t('base.saySomething') }}</span>
+        <span v-else>{{ t('base.silent') }}</span>
 
         <div
           class="disSpeakBtn"
@@ -402,7 +406,7 @@
     search.set('m', browser.getURLParam('m'));
     const lang = unref(getLocale);
     search.set('lang', lang);
-
+    Number(import.meta.env.VITE_SHOW_CONSOLE) === 1 && search.set('vlog', '1');
     const url = new URL(location.href);
     url.search = `?` + search.toString();
     shareLink.value = url.toString();

+ 1 - 1
src/hooks/useTRTC.ts

@@ -3,7 +3,7 @@ import { nextTick, ref } from 'vue';
 import TRTC from 'trtc-js-sdk';
 import type { LocalStream, Client, RemoteStream } from 'trtc-js-sdk';
 import { useRtcStore } from '/@/store/modules/rtc';
-import Dialog from '/@/components/basic/dialog';
+// import Dialog from '/@/components/basic/dialog';
 import { useI18n } from './useI18n';
 
 let localClient: Client;

+ 3 - 1
src/locales/lang/en/base.ts

@@ -30,5 +30,7 @@ export default {
   joinRoom: '加入带看房间',
   hoster: 'hoster',
   audioPermission: '继续访问该页面需要获取您摄像头及麦克风的权限。',
-  nickNameRegrexError: '昵称应是为中文、英文、数字或者下划线,且长度为1到15',
+  nickNameRegrexError:
+    'The nickname is limited to 1 to 15 characters in Chinese, English, digits, or underscores.',
+  silent: 'silent',
 };

+ 1 - 0
src/locales/lang/zh/base.ts

@@ -31,4 +31,5 @@ export default {
   hoster: '主持人',
   audioPermission: '继续访问该页面需要获取您摄像头及麦克风的权限。',
   nickNameRegrexError: '昵称应是为中文、英文、数字或者下划线,且长度为1到15',
+  silent: '已被禁言',
 };