Merge branch 'master' into renyicun-dev

src/assets/images/icons/navs/navigation_normal.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>navigation_normal</title>
+    <g id="编辑器" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="画板" transform="translate(-64.000000, -106.000000)">
+            <g id="navigation_normal" transform="translate(64.000000, 106.000000)">
+                <path d="M3.55555556,0 L10.6666667,0 C12.6303458,0 14.2222222,1.59187645 14.2222222,3.55555556 L14.2222222,10.6666667 C14.2222222,12.6303458 12.6303458,14.2222222 10.6666667,14.2222222 L3.55555556,14.2222222 C1.59187645,14.2222222 0,12.6303458 0,10.6666667 L0,3.55555556 C0,1.59187645 1.59187645,0 3.55555556,0 Z" id="矩形" fill="#767676"></path>
+                <path d="M3.55555556,17.7777778 L10.6666667,17.7777778 C12.6303458,17.7777778 14.2222222,19.3696542 14.2222222,21.3333333 L14.2222222,28.4444444 C14.2222222,30.4081236 12.6303458,32 10.6666667,32 L3.55555556,32 C1.59187645,32 0,30.4081236 0,28.4444444 L0,21.3333333 C0,19.3696542 1.59187645,17.7777778 3.55555556,17.7777778 Z" id="矩形" fill="#767676"></path>
+                <circle id="椭圆形" fill="#4E4E4E" cx="24.8888889" cy="24.8888889" r="7.11111111"></circle>
+                <path d="M21.3333333,0 L28.4444444,0 C30.4081236,0 32,1.59187645 32,3.55555556 L32,10.6666667 C32,12.6303458 30.4081236,14.2222222 28.4444444,14.2222222 L21.3333333,14.2222222 C19.3696542,14.2222222 17.7777778,12.6303458 17.7777778,10.6666667 L17.7777778,3.55555556 C17.7777778,1.59187645 19.3696542,0 21.3333333,0 Z" id="矩形" fill="#767676"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/images/icons/navs/navigation_selected.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>navigation_selected</title>
+    <g id="编辑器" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="画板" transform="translate(-64.000000, -55.000000)">
+            <g id="navigation_selected" transform="translate(64.000000, 55.000000)">
+                <path d="M3.55555556,0 L10.6666667,0 C12.6303458,0 14.2222222,1.59187645 14.2222222,3.55555556 L14.2222222,10.6666667 C14.2222222,12.6303458 12.6303458,14.2222222 10.6666667,14.2222222 L3.55555556,14.2222222 C1.59187645,14.2222222 0,12.6303458 0,10.6666667 L0,3.55555556 C0,1.59187645 1.59187645,0 3.55555556,0 Z" id="矩形" fill="#0076F6"></path>
+                <path d="M3.55555556,17.7777778 L10.6666667,17.7777778 C12.6303458,17.7777778 14.2222222,19.3696542 14.2222222,21.3333333 L14.2222222,28.4444444 C14.2222222,30.4081236 12.6303458,32 10.6666667,32 L3.55555556,32 C1.59187645,32 0,30.4081236 0,28.4444444 L0,21.3333333 C0,19.3696542 1.59187645,17.7777778 3.55555556,17.7777778 Z" id="矩形" fill="#0076F6"></path>
+                <circle id="椭圆形" fill="#80BAFA" cx="24.8888889" cy="24.8888889" r="7.11111111"></circle>
+                <path d="M21.3333333,0 L28.4444444,0 C30.4081236,0 32,1.59187645 32,3.55555556 L32,10.6666667 C32,12.6303458 30.4081236,14.2222222 28.4444444,14.2222222 L21.3333333,14.2222222 C19.3696542,14.2222222 17.7777778,12.6303458 17.7777778,10.6666667 L17.7777778,3.55555556 C17.7777778,1.59187645 19.3696542,0 21.3333333,0 Z" id="矩形" fill="#0076F6"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/style/common.less

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

src/assets/style/component.less

@@ -6,6 +6,10 @@
 @cancelhoverclr:#EBEDF0;
 @cancelactiveclr:#D3D4D7;
 
+@deepcancelcolor:#313131;
+@deepcancelhoverclr:#3d3d3d;
+@deepcancelactiveclr:#3d3d3d;
+
 @fontcolor:#323233;
 
 ::-webkit-scrollbar {
@@ -632,6 +636,22 @@ textarea:-ms-input-placeholder {
     }
   }
 
+  &.deepcancel {
+    background-color: @deepcancelcolor!important;
+    border-color:  @deepcancelcolor!important;
+    color: #fff!important;
+    &:hover{
+      background-color: @deepcancelhoverclr!important;
+      border-color:  @deepcancelhoverclr!important;
+      color: #fff!important;
+    }
+    &:active{
+      background-color: @deepcancelactiveclr!important;
+      border-color:  @deepcancelactiveclr!important;
+      color: #fff!important;
+    }
+  }
+
   &.block {
     width: 100%;
   }

src/components/paging.vue

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

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>

src/components/select.vue

@@ -35,7 +35,7 @@
                 <div class="typeli">
                   <i
                     class="iconfont iconedit_type_3d"
-                    :class="{'iconjump':item.type!=='4dkk'}"
+                    :class="{'iconedit_type_panorama':item.type!=='4dkk'}"
                   ></i>
                 </div>
                 <div class="img">

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:{

src/config/menu.js

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

src/framework/Head.vue

@@ -1,18 +1,19 @@
 <template>
   <header class="app-head" app-border dir-bottom>
     <span class="app-head-title">{{ info.name }}</span>
+    <div class="app-head-save ui-button deepcancel app-head-view" @click="onView" :class="{ disable: !canLoad }">
+      <i class="iconfont iconeditor_preview"></i>
+      预览
+    </div>
+
     <div
-      class="app-head-save app-head-view"
+      class="ui-button submit app-head-save"
       @click="onSave"
       :class="{ disable: !canLoad }"
     >
-      <i class="iconfont icon_save"></i>
+      <i class="iconfont iconeditor_save"></i>
       保存
     </div>
-    <div class="app-head-save" @click="onView" :class="{ disable: !canLoad }">
-      <i class="iconfont icon_eye"></i>
-      预览
-    </div>
     <preview
       v-if="info"
       :name="info.name"
@@ -219,23 +220,17 @@ export default {
   top: 50%;
   right: 10px;
   margin-top: -16px;
-  height: 32px;
-  border-radius: 32px;
-  padding: 0 30px;
-  font-size: 12px;
-  color: #efefef;
-  background-color: @color;
-  &:hover {
-    color: #fff;
-  }
   i {
-    font-size: 24px;
-    margin-top: 2px;
-    margin-right: 1px;
+    font-size: 14px;
+    margin-right: 4px;
   }
 }
 
+.ui-preview{
+  background: #313131;
+}
+
 .app-head-view {
-  right: 130px;
+  right: 120px;
 }
 </style>

src/framework/MenuPC.vue

@@ -3,7 +3,8 @@
     <ul class="pc-menu-container">
       <li v-for="(item, key) in menu" v-show="!item.hidden" :class="{disable:key!=0&&!isShow}" :key="key">
         <router-link :to="item.link" :exact="false">
-          <i class="iconfont" :class="item.icon"></i>
+          <img class="normal" :src="require(`@/assets/images/icons/navs/${item.icon}_normal.svg`)" alt="">
+          <img class="active" :src="require(`@/assets/images/icons/navs/${item.icon}_selected.svg`)" alt="">
           <span>{{ item.text }}</span>
         </router-link>
       </li>
@@ -46,22 +47,39 @@ 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;
+        >img{
+          width: 18px;
+        }
+        .normal{
+          display: inline-block;
+        }
+        .active{
+          display: none;
+        }
         &.router-link-exact-active,
         &.router-link-active {
-          background-color: @color;
+          color: @color;
+          background: #252526;
+
+          .normal{
+            display: none;
+          }
+          .active{
+            display: inline-block;
+
+          }
         }
       }
     }

src/framework/Toolbar.vue

@@ -22,7 +22,7 @@
             <div class="typeli">
               <i
                 class="iconfont iconedit_type_3d"
-                :class="{ iconjump: item.type !== 'house' }"
+                :class="{ iconedit_type_panorama: item.type !== 'house' }"
               ></i>
             </div>
             <div class="img">

src/framework/index.vue

@@ -23,4 +23,15 @@ export default {
   height: 100%;
   overflow: hidden;
 }
+.el-message--success, .el-message--warning, .el-message--error{
+  background: #1F1F1F!important;
+  box-shadow: 0px 9px 28px 8px rgba(0, 0, 0, 0.2), 0px 6px 16px 0px rgba(0, 0, 0, 0.32), 0px 3px 6px -4px rgba(0, 0, 0, 0.48)!important;
+  border-radius: 40px!important;
+  border: 1px solid #333333!important;
+  .el-message__content{
+    color: rgba(255, 255, 255, 0.6)!important;
+  }
+}
+
+
 </style>

src/framework/show/index.vue

@@ -5,6 +5,11 @@
       :src="`/spc.html?m=${activeItem.sceneCode}`" frameborder="0"></iframe>
       <div v-show="activeItem.type!='4dkk'" id="pano"></div>
 
+      <div class="pano-logo" v-if="showInfo.isLogo&&activeItem.type!='4dkk'">
+        <img :src="showInfo.logo||require('@/assets/images/default/img_logoshow@2x.png')" alt="" />
+      </div>
+
+
       <div
         class="oper-tips"
         :class="{ hidetips: !showTips }"
@@ -276,10 +281,12 @@ export default {
     },
     canLoad(newVal) {
       if (newVal) {
-        this.showTips = this.localRemind
         setTimeout(() => {
-          this.showTips = false;
-        }, this.showInfo.remindTime * 1000);
+          this.showTips = this.localRemind
+          setTimeout(() => {
+            this.showTips = false;
+          }, this.showInfo.remindTime * 1000);
+        }, 1000);
       }
     },
     showInfo: {
@@ -399,6 +406,17 @@ export default {
     height: 100%;
   }
 
+  .pano-logo {
+    position: absolute;
+    top: 20px;
+    left: 20px;
+    > img {
+      max-width: 120px;
+      max-height: 100px;
+      pointer-events: none;
+    }
+  }
+
   .oper-tips {
     position: absolute;
     top: 50%;

src/framework/show/list.vue

@@ -7,7 +7,7 @@
             <li :title="item.sceneTitle" @click="handleVR(item)" v-for="(item, i) in scenes" :key="i">
               <div :class="{ active: selected.sceneCode == item.sceneCode }">
                 <img :src="item.icon + `?${Math.random()}`" alt="" />
-                <i class="iconfont iconedit_type_3d" :class="{ iconjump: item.type !== '4dkk' }"></i>
+                <i class="iconfont iconedit_type_3d" :class="{ iconedit_type_panorama: item.type !== '4dkk' }"></i>
                 <rollName :offset="20" :active="selected.sceneCode == item.sceneCode" class="pic-name" :myref="'subw' + item.id" :name="item.sceneTitle" />
               </div>
             </li>
@@ -254,6 +254,7 @@ export default {
     pointer-events: auto;
     height: 36px;
     line-height: 36px;
+    color: #fff;
 
     > i {
       margin-right: 8px;

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{

src/framework/showMobile/index.vue

@@ -6,6 +6,19 @@
         :url="`/embed.html?from=mingyuan&m=${activeItem.sceneCode}`"
       />
       <div v-show="activeItem.type != '4dkk'" id="pano"></div>
+      
+      <div
+        class="pano-logo"
+        v-if="showInfo.isLogo && activeItem.type != '4dkk'"
+      >
+        <img
+          :src="
+            showInfo.logo ||
+            require('@/assets/images/default/img_logoshow@2x.png')
+          "
+          alt=""
+        />
+      </div>
 
       <list
         v-if="canLoad&&!isVR"
@@ -313,10 +326,12 @@ export default {
     },
     canLoad(newVal) {
       if (newVal) {
-        this.showTips = this.localRemind
         setTimeout(() => {
-          this.showTips = false;
-        }, this.showInfo.remindTime * 1000);
+          this.showTips = this.localRemind
+          setTimeout(() => {
+            this.showTips = false;
+          }, this.showInfo.remindTime * 1000);
+        }, 1000);
       }
     },
     showInfo: {
@@ -482,6 +497,17 @@ export default {
     }
   }
 
+  .pano-logo {
+    position: absolute;
+    top: 10px;
+    left: 10px;
+    > img {
+      max-width: 80px;
+      max-height: 80px;
+      pointer-events: none;
+    }
+  }
+
   .oper-tips {
     position: absolute;
     top: 40%;

src/framework/showMobile/list.vue

@@ -6,7 +6,7 @@
           <li @click="handleVR(item)" v-for="(item,i) in scenes" :key="i">
             <div :class="{active:selected.sceneCode==item.sceneCode}">
               <img :src="item.icon+`?${Math.random()}`" alt="" />
-              <i class="iconfont" :class="item.type!='4dkk'?'iconjump':'iconscene_map_3d'"></i>
+              <i class="iconfont" :class="item.type!='4dkk'?'iconedit_type_panorama':'iconedit_type_3d'"></i>
               <rollName :offset="20" :active="selected.sceneCode==item.sceneCode" class="pic-name" :myref="'subw'+item.id" :name="item.sceneTitle"/>
             </div>
           </li>
@@ -293,6 +293,7 @@ export default {
     padding: 0 10px;
     height: 36px;
     line-height: 36px;
+    color: #fff;
     >i{
       margin-right: 8px;
       vertical-align: bottom;

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{

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;
 }

src/views/base/Toolbar.vue

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

src/views/hotspot/EditPanel.vue

@@ -578,6 +578,7 @@ export default {
       display: flex;
       align-items: center;
       flex-wrap: wrap;
+      min-width: 216px;
       li {
         position: relative;
         cursor: pointer;

src/views/hotspot/Toolbar.vue

@@ -17,7 +17,7 @@
         <ul ref="clip">
           <li v-for="(item, i) in list" @click="activeItem = item" :class="{'li-active':item.sceneCode==activeItem.sceneCode}" :key="i">
             <div class="typeli">
-              <i class="iconfont iconedit_type_3d" :class="{'iconjump':item.type!=='house'}"></i>
+              <i class="iconfont iconedit_type_3d" :class="{'iconedit_type_panorama':item.type!=='house'}"></i>
             </div>
             <div class="img">
               <img :src="item.icon" alt="">

src/views/hotspot/hotspotType/image.vue

@@ -165,6 +165,9 @@ export default {
         top: 50%;
         left: 50%;
         transform: translate(-50%,-50%);
+        min-width: unset;
+        width: 90%;
+        font-size: 12px;
       }
     }
     &:nth-of-type(3n){

src/views/hotspot/hotspotType/scene.vue

@@ -5,7 +5,7 @@
       <span v-if="!selected.icon">选择场景</span>
       <div class="scene-con" v-else>
         <i class="iconfont iconedit_type_3d"
-                    :class="{'iconjump':selected.type!=='4dkk'}"></i>
+                    :class="{'iconedit_type_panorama':selected.type!=='4dkk'}"></i>
         <img class="icon" :src="selected.icon||$thumb" alt="">
         <span class="shenglve">{{selected.sceneTitle||'名字'}}</span>
         <i @click="del" class="iconfont iconedit_case_delete"></i>

src/views/hotspot/index.vue

@@ -23,7 +23,7 @@
                 :key="i"
               >
                 <div class="typeli">
-                  <i class="iconfont iconedit_type_3d" :class="{'iconjump':item.type!=='house'}"></i>
+                  <i class="iconfont iconedit_type_3d" :class="{'iconedit_type_panorama':item.type!=='house'}"></i>
                 </div>
                 <div class="img">
                   <img :src="item.icon" alt="">

src/views/information/Toolbar.vue

@@ -84,8 +84,8 @@
             <li v-for="(item, i) in scenes" :key="i">
               <div class="typeli">
                 <i
-                  class="iconfont iconscene_map_3d"
-                  :class="{iconedit_type_3d: item.type !== '4dkk' }"
+                  class="iconfont iconedit_type_3d"
+                  :class="{iconedit_type_panorama: item.type !== '4dkk' }"
                 ></i>
               </div>
               <div class="img">

src/views/screen/Toolbar.vue

@@ -17,7 +17,7 @@
         <ul ref="clip">
           <li v-for="(item, i) in list" @click="activeItem = item" :class="{'li-active':item.sceneCode==activeItem.sceneCode}" :key="i">
             <div class="typeli">
-              <i class="iconfont iconedit_type_3d" :class="{'iconjump':item.type!=='house'}"></i>
+              <i class="iconfont iconedit_type_3d" :class="{'iconedit_type_panorama':item.type!=='house'}"></i>
             </div>
             <div class="img">
               <img :src="item.icon+`?${Math.random()}`" alt="">