Home Esplora Aiuto
Registrati Accedi
zhangyupeng
/
daikan-international
1
0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

update

gemercheung 2 anni fa
parent
2d29099524
commit
389d73453e
4 ha cambiato i file con 26 aggiunte e 17 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 2 2
      index.html
  2. 10 10
      src/components/basic/miniMap.vue
  3. 1 1
      src/components/chatRoom/controls/join.ts
  4. 13 4
      src/components/chatRoom/dialog/close.vue

+ 2 - 2
index.html
Vedi File 

@@ -25,8 +25,8 @@
 
   <body>
 
     <div id="app"></div>
 
     <script type="module" src="/src/main.ts"></script>
 
-    <script src="<{VITE_APP_SDK_DIR}>/kankan-sdk-deps.js?v=4.4.2-alpha.0"></script>
 
-    <script src="<{VITE_APP_SDK_DIR}>/kankan-sdk.js?v=4.4.2-alpha.0"></script>
 
+    <script src="<{VITE_APP_SDK_DIR}>/kankan-sdk-deps.js?v=4.4.2-alpha.3"></script>
 
+    <script src="<{VITE_APP_SDK_DIR}>/kankan-sdk.js?v=4.4.2-alpha.3"></script>
 
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/flv.min.js"></script>
 
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/vconsole.js"></script>
 
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/swiper/swiper-bundle.min.js"></script>

+ 10 - 10
src/components/basic/miniMap.vue
Vedi File 

@@ -61,18 +61,18 @@
 
       });

 

       const toggleMap = () => {

-        if (unref(isLeader) || unref(isTourMode)) {

-          isCollapse.value = !isCollapse.value;

-          emit('toggleMap', isCollapse.value);

-          let $minmap = document.querySelector('[xui_min_map]');

-          if ($minmap) {

-            if (!isCollapse.value) {

-              $minmap.classList.remove('collapse');

-            } else {

-              $minmap.classList.add('collapse');

-            }

+        // if (unref(isLeader) || unref(isTourMode)) {

+        isCollapse.value = !isCollapse.value;

+        emit('toggleMap', isCollapse.value);

+        let $minmap = document.querySelector('[xui_min_map]');

+        if ($minmap) {

+          if (!isCollapse.value) {

+            $minmap.classList.remove('collapse');

+          } else {

+            $minmap.classList.add('collapse');

           }

         }

+        // }

       };

       const changeMode = () => {

         if (unref(isLeader) || unref(isTourMode)) {

+ 1 - 1
src/components/chatRoom/controls/join.ts
Vedi File 

@@ -30,7 +30,7 @@ export function handleJoin(data: any) {
 
   const maxNumber = import.meta.env.VITE_ROOM_MEMBER || 10;

   // console.log('roomMaxNumber', maxNumber);

   console.log('roomMaxNumber', maxNumber, rtcStore.memberList.length, Number(maxNumber));

-  if (rtcStore.memberList.length >= Number(maxNumber)) {

+  if (rtcStore.memberList.length > Number(maxNumber)) {

     if (rtcStore.role === 'customer') {

       rtcStore.showBaseDialog(

         {

+ 13 - 4
src/components/chatRoom/dialog/close.vue
Vedi File 

@@ -6,8 +6,8 @@
 
         <div class="dialog_title">{{ props.title }}</div>
 
         <p class="dialog_desc">{{ props.desc }}</p>
 
         <div class="created_btn">
 
-          <div class="end_cancel" @click="endLiveCancel">取消</div>
 
-          <div class="end_confirm" @click="endLiveConfirm">立即结束</div>
 
+          <div class="end_cancel" @click="endLiveCancel">{{ t('base.cancel') }}</div>
 
+          <div class="end_confirm" @click="endLiveConfirm">{{ t('base.endNow') }}</div>
 
         </div>
 
       </div>
 
     </div>
 
@@ -17,19 +17,28 @@
 
 <script setup>
 
   import browser from '/@/utils/browser';
 
   import { onMounted, watch, defineProps, defineEmits, ref, computed } from 'vue';
 
+  import { useI18n } from '/@/hooks/useI18n';
 
 
   const emit = defineEmits(['closeDialog', 'confirmDialog']);
 
 
+  const { t } = useI18n();
 
+
 
   const role = ref(browser.urlHashValue('role'));
 
 
   const props = defineProps({
 
     title: {
 
       type: String,
 
-      default: '温馨提示',
 
+      default: () => {
 
+        const { t } = useI18n();
 
+        return t('base.tips');
 
+      },
 
     },
 
     desc: {
 
       type: String,
 
-      default: '是否结束带看？',
 
+      default: () => {
 
+        const { t } = useI18n();
 
+        return t('base.endRoom');
 
+      },
 
     },
 
   });