tremble пре 3 година
родитељ
комит
7b83960131

+ 8 - 0
src/assets/style/common.less

@@ -4,4 +4,12 @@
 
 .tttttt{
   cursor: pointer;
+}
+
+.dialog{
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
 }

+ 1 - 1
src/components/paging.vue

@@ -131,7 +131,7 @@ export default {
     margin: 0 10px;
 
     &.active {
-      color: rgba(0,200,175,1);
+      color: #0076F6;
     }
   }
   .number span {

+ 1 - 1
src/components/preview/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <popup v-if="show">
+    <popup v-if="show" :zIdx="1100">
       <div class="ui-message ui-message-confirm">
         <div class="ui-message-header">
           <span>全景作品预览</span>

+ 2 - 1
src/components/shared/popup/index.vue

@@ -11,10 +11,11 @@ export default {
         isPass: Boolean,
         canClose:Boolean,
         bgColor: String,
+        zIdx: String,
     },
     data() {
         return {
-            zIndex: nextIndex()
+            zIndex: this.zIdx || nextIndex()
         };
     },
     methods:{

+ 4 - 4
src/config/menu.js

@@ -1,6 +1,6 @@
 const PCMenu = [
   {
-    text: "基础设置",
+    text: "基础",
     icon: "icon_base",
     link: "/base",
     name: "base",
@@ -8,7 +8,7 @@ const PCMenu = [
     hidescene:true
   },
   {
-    text: "场景导航",
+    text: "导航",
     icon: "iconchangjingdaohang",
     link: "/information",
     name: "information",
@@ -16,14 +16,14 @@ const PCMenu = [
     hidescene:true
   },
   {
-    text: "初始画面",
+    text: "初始",
     icon: "icon_screen",
     link: "/screen",
     name: "screen",
     hidden: false
   },
   {
-    text: "热点设置",
+    text: "热点",
     icon: "icon_hotpoint",
     link: "/hotspot",
     name: "hotspot",

+ 4 - 4
src/framework/MenuPC.vue

@@ -46,22 +46,22 @@ export default {
 </script>
 <style lang="less">
 .pc-menu {
-  width: 80px;
+  width: 58px;
   ul {
     li {
       cursor: pointer;
       text-align: center;
-      margin-top: 10px;
       white-space: normal;
 
       a {
         width: 100%;
         height: 100%;
-        padding: 8px;
+        padding: 5px;
         display: inline-block;
         &.router-link-exact-active,
         &.router-link-active {
-          background-color: @color;
+          color: @color;
+          background: #252526;
         }
       }
     }

+ 10 - 4
src/framework/show/popup/password.vue

@@ -17,6 +17,9 @@
               maxlength="20"
               placeholder="请输入访问密码"
               v-model="key"
+              :class="{active: isPassWordFocus}" 
+              @focusin="isPassWordFocus = true" 
+              @focusout="isPassWordFocus = false"
             />
             <i v-if="key" ref="isearch" class="iconfont icon_close" @click="key=''"></i>
           </div>
@@ -43,7 +46,8 @@ export default {
   },
   data(){
     return {
-      key:''
+      key:'',
+      isPassWordFocus:false
     }
   },
   methods:{
@@ -72,9 +76,7 @@ export default {
   }
   
 
-  .ui-message-header{
-    border-bottom: 1px solid #EBEBEB;
-  }
+ 
   .ui-message-main{
     width: 330px;
     margin: 20px auto;
@@ -99,6 +101,10 @@ export default {
       border: 1px solid rgba(#909090,0.5);
       color: #909090;
     }
+
+    .active{
+      border: 1px solid #0076F6;
+    }
     
   }
   .ui-message-footer{

+ 6 - 0
src/framework/showMobile/popup/password.vue

@@ -16,6 +16,9 @@
               maxlength="20"
               placeholder="请输入访问密码"
               v-model="key"
+              :class="{active: isPassWordFocus}" 
+              @focusin="isPassWordFocus = true" 
+              @focusout="isPassWordFocus = false"
             />
             <i v-if="key" class="iconfont icon_close" @click="key=''"></i>
           </div>
@@ -81,6 +84,9 @@ export default {
       border: 1px solid rgba(#909090,0.5);
       color: #909090;
     }
+    .active{
+      border: 1px solid #0076F6;
+    }
     >div{
       position: relative;
       >i{

+ 1 - 1
src/pages/Edit.vue

@@ -25,7 +25,7 @@ body {
   color: #fff;
   font-size: 14px;
   line-height: normal;
-  background-color: rgb(38, 39, 41);
+  background-color: #1A1B1D;
   user-select: none;
   font-family: OpenSans, sans-serif;
 }

+ 1 - 0
src/views/base/Toolbar.vue

@@ -215,6 +215,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 .ui-title-big{
   margin-top: 20px;
 }