tremble 3 tahun lalu
induk
melakukan
5335b77e55

+ 4 - 3
packages/v4_page/src/app.vue

@@ -1,7 +1,7 @@
 <template>
+  <Password />
   <LoadingLogo :thumb="true" />
   <Guide />
-
   <div class="ui-view-layout" :class="{ show: show }" is-mobile="true">
     <div class="scene" ref="scene$"></div>
     <template v-if="dataLoaded">
@@ -12,7 +12,7 @@
           <ui-icon type="show_map_collect"></ui-icon>
         </span>
 
-        <p class="change" @click="changeMode('dollhouse')">
+        <p class="change" v-if="controls.showDollhouse" @click="changeMode('dollhouse')">
           <ui-icon type="show_3d_normal"></ui-icon>
           3D模型
         </p>
@@ -47,6 +47,7 @@ import Control from "@/components/Controls/Control.Mobile.vue";
 import LoadingLogo from "@/components/shared/Loading.vue";
 import OpenVideo from "@/components/openVideo/";
 import Guide from "@/components/shared/Guide.vue";
+import Password from "@/components/shared/Password.vue";
 
 import { createApp } from "@/app";
 import { ref, onMounted, computed, nextTick, watch } from "vue";
@@ -199,7 +200,7 @@ onMounted(() => {
     dom: scene$.value,
     mobile: true,
   });
-  // app.Scene.lock()
+  app.Scene.lock();
   app.use("MinMap", { theme: { camera_fillStyle: "#0076f6" } });
   app.use("Tag");
   app.use("TourPlayer");

+ 2 - 2
packages/v4_page/src/components/shared/Password.vue

@@ -1,8 +1,8 @@
 <template>
-    <ui-window v-if="show" @ok="onOk" @no="onNo" :showCloseIcon="false" :showCancelButton="false">
+    <ui-window v-if="show" @ok="onOk" @no="onNo" :okText="'确定'" :title="'提示'" :showCloseIcon="false" :showCancelButton="false">
         <template v-slot:content>
             <div class="wrapper">
-                <ui-input type="password" placeholder="请输入浏览密码" maxlength="4" v-model.trim="password" width="100%" @input="onPasswordChange" @keyup.enter="onOk" />
+                <ui-input type="password" :placeholder="'请输入浏览密码'" maxlength="4" v-model.trim="password" width="100%" @input="onPasswordChange" @keyup.enter="onOk" />
                 <span class="error">{{ error }}</span>
             </div>
         </template>

+ 3 - 2
packages/v4_page/src/global_components/expose-common.js

@@ -12,6 +12,7 @@ import Message from './components/message'
 import Tree from './components/tree'
 import Button from './components/button'
 import { Group, GroupOption } from './components/group'
+import Input from './components/input'
 import Icon from './components/icon'
 import Floating from './components/floating'
 import MenuItem from './components/menu-item'
@@ -21,9 +22,9 @@ import Audio from './components/audio'
 import Cropper from './components/cropper'
 import Scrollbar from './components/scrollbar'
 
-const components = setup(DialogContent, Cropper, Message, Loading, Dialog, Window, Toast, Alert, Tree, Button, Group, GroupOption,  Icon, MenuItem, Floating, Gate, GateContent, Slide, Audio)
+const components = setup(DialogContent, Cropper, Message, Loading, Dialog, Window, Toast, Alert, Tree, Button, Group, GroupOption, Input, Icon, MenuItem, Floating, Gate, GateContent, Slide, Audio)
 
-export { Scrollbar, DialogContent, Cropper, Message, Loading, Dialog, Tree, Button, Group, GroupOption,  Icon, MenuItem, Floating, Gate, GateContent, Slide, Audio }
+export { Scrollbar, DialogContent, Cropper, Message, Loading, Dialog, Tree, Button, Group, GroupOption, Input, Icon, MenuItem, Floating, Gate, GateContent, Slide, Audio }
 
 export default function install(app) {
     components.forEach(component => component.install(app))