Procházet zdrojové kódy

Merge branch 'dev'

tremble před 3 roky
rodič
revize
8b5bc22774
1 změnil soubory, kde provedl 20 přidání a 21 odebrání
  1. 20 21
      src/app.vue

+ 20 - 21
src/app.vue

@@ -8,14 +8,14 @@
     <template v-if="dataLoaded">
       <Information v-if="!isshoppingguide" />
       <Control />
-    
+
       <teleport v-if="refMiniMap && player.showWidgets" :to="refMiniMap">
         <span :class="{ gudieDisabled: isshoppingguide && role != 'leader' }" class="button-switch" @click.stop="toggleMap">
           <ui-icon type="show_map_collect"></ui-icon>
         </span>
         <div v-if="controls.showDollhouse" :class="{ gudieDisabled: isshoppingguide && role != 'leader' }" class="change" @click="changeMode('dollhouse')">
           <ui-icon type="show_3d_normal"></ui-icon>
-          <span> {{ $t('mode.dollhouseModel') }}</span>
+          <span> {{ $t("mode.dollhouseModel") }}</span>
         </div>
       </teleport>
 
@@ -29,12 +29,12 @@
           <div class="tabs" v-if="controls.showMap">
             <span :class="{ active: mode === 'floorplan' }" ref="floorplan_ref" @click="changeMode('floorplan', $event)">
               <ui-icon :type="mode == 'floorplan' ? 'show_plane_selected' : 'show_plane_normal'"></ui-icon>
-              {{ $t('mode.floorplan') }}
+              {{ $t("mode.floorplan") }}
             </span>
             <span :class="{ active: mode === 'dollhouse' }" ref="dollhouse_ref" @click="changeMode('dollhouse', $event)">
               <ui-icon :type="mode == 'dollhouse' ? 'show_3d_selected' : 'show_3d_normal'"></ui-icon>
 
-              {{ $t('mode.dollhouse') }}
+              {{ $t("mode.dollhouse") }}
             </span>
             <div class="background" ref="background"></div>
           </div>
@@ -69,13 +69,13 @@ import { useStore } from "vuex";
 import browser from "@/utils/browser";
 import { useApp, getApp } from "@/app";
 import common from "@/utils/common";
-import { useI18n, getLocale } from '@/i18n'
+import { useI18n, getLocale } from "@/i18n";
 import { Cache } from "@/utils/index";
 import wxShare from "@/utils/wxshare";
 
 import * as apis from "@/apis/index.js";
 
-const { t } = useI18n({ useScope: 'global' })
+const { t } = useI18n({ useScope: "global" });
 
 const store = useStore();
 
@@ -351,7 +351,7 @@ onMounted(async () => {
           return `<span class="tag-icon animate" style="background-image:url({{icon}})"></span>
                       <div class="tag-body">
                         <div data-id="${data.sid}" class="tag-commodity tag-link_scene">
-                          <p class="tag-title">${ t('common.goNext')}</p>
+                          <p class="tag-title">${t("common.goNext")}</p>
                         </div>
                       </div>
                   `;
@@ -367,7 +367,7 @@ onMounted(async () => {
                           <div  style="background-image:url(${data.products[0] ? data.products[0].pic : ""})" class='tag-avatar'>
                           </div>
                           <p class="tag-title">${data.title}</p>
-                          <p class="tag-info">${range} | ${t('common.view')} ></p>
+                          <p class="tag-info">${range} | ${t("common.view")} ></p>
                         </div>
                       </div>
                   `;
@@ -452,12 +452,12 @@ onMounted(async () => {
   // }
   app.Scene.on("ready", () => {
     show.value = true;
-    store.commit('SetPlayerOptions', {
-        lang: getLocale(),
-    })
+    store.commit("SetPlayerOptions", {
+      lang: getLocale(),
+    });
     wxShare({
-      title: `${t('common.title')}~`,
-      desc:  `${t('common.title')}~`,
+      title: `${t("common.title")}~`,
+      desc: `${t("common.title")}~`,
       link: window.location.href,
       imgUrl: "https://glp-vr.cdfmembers.com/cdf/file/91dd5305525f463286f03a31abd1c154.jpg",
     });
@@ -465,16 +465,16 @@ onMounted(async () => {
   app.Scene.on("error", (data) => {
     switch (data.code) {
       case 5033:
-        Dialog.alert(t('common.calculation'));
+        Dialog.alert(t("common.calculation"));
         break;
       case 5034:
-        Dialog.alert(t('common.title'));
+        Dialog.alert(t("common.title"));
         break;
       case 5009:
-        Dialog.alert(t('common.title'));
+        Dialog.alert(t("common.title"));
         break;
       case 5005:
-        Dialog.alert(t('common.title'));
+        Dialog.alert(t("common.title"));
         break;
     }
   });
@@ -489,10 +489,9 @@ onMounted(async () => {
       if (!localStorage.getItem("user_guide")) {
         Dialog.confirm({
           showCloseIcon: false,
-          okText: t('common.know'),
-          content:
-            "<span style='font-size: 16px; line-height: 1.5;'>"+t('common.notice')+"<span/>",
-          title: `${t('common.know')}:` ,
+          okText: t("common.know"),
+          content: "<span style='font-size: 16px; line-height: 1.5;'>" + t("common.notice") + "<span/>",
+          title: `${t("common.know")}:`,
           single: true,
           func: (state) => {
             if (state == "ok") {