展示端，编辑端样式修改

public/static/lib/iconfont/demo_index.html

@@ -2157,7 +2157,7 @@
           </li>
           
           <li class="dib">
-            <span class="icon iconfont iconscene_map_3d"></span>
+            <span class="icon iconfont iconedit_type_3d"></span>
             <div class="name">
               scene_map_3d
             </div>

public/static/lib/iconfontQJ/demo_index.html

@@ -330,7 +330,7 @@
           </li>
           
           <li class="dib">
-            <span class="icon iconfont iconscene_map_3d"></span>
+            <span class="icon iconfont iconedit_type_3d"></span>
             <div class="name">
               scene_map_3d
             </div>

src/assets/style/component.less

@@ -740,9 +740,11 @@ textarea:-ms-input-placeholder {
   border: 1px solid #E4E7ED;
   padding: 26px;
   &.dark {
-    background: #252828;
+    background: #1A1B1D;
+    color: rgba(255, 255, 255, 0.6);
+    box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.06);
+    border: 1px solid #404040;
     .ui-message-header {
-      border-bottom: 1px solid rgba(255, 255, 255, 0.1);
       span {
         font-size: 18px;
         color: #fff;
@@ -752,12 +754,18 @@ textarea:-ms-input-placeholder {
         }
       }
     }
+    .ui-message-main{
+      text-align: left;
+      min-height: 80px;
+      margin-top: 60px;
+    }
   }
 }
 
 .message-material{
   border-radius: 2px;
   @color:#0076F6;
+  background: #fff;
   padding: 26px;
   .header-material{
     border-bottom: none;

src/components/select.vue

@@ -34,7 +34,7 @@
               >
                 <div class="typeli">
                   <i
-                    class="iconfont iconscene_map_3d"
+                    class="iconfont iconedit_type_3d"
                     :class="{'iconjump':item.type!=='4dkk'}"
                   ></i>
                 </div>
@@ -126,7 +126,7 @@ components: {tabList},
       backupInfo: "backupInfo"
     }),
     disable() {
-      return !this.select;
+      return !this.select.id;
     }
   },
   data() {

src/components/shared/message/Confirm.vue

@@ -1,6 +1,6 @@
 <template>
     <popup ref="Message" :show="show">
-        <div class="ui-message ui-message-confirm" :class="{'message-material':isMaterial}">
+        <div class="ui-message ui-message-confirm" :class="[isMaterial?'message-material':'dark']">
             <div class="ui-message-header" :class="{'header-material':isMaterial}">
                 <span>{{title}}</span>
                 <span @click="onNo" v-if="showCloseIcon">
@@ -8,7 +8,7 @@
                 </span>
             </div>
             <div class="ui-message-main" :class="{'main-material':isMaterial}">
-                <div class="ui-message-icon" :class="[icon?icon:null]"></div>
+                <!-- <div class="ui-message-icon" :class="[icon?icon:null]"></div> -->
                 <div class="ui-message-title">{{tips}}</div>
                 <div class="ui-message-content" v-html="content"></div>
             </div>

src/framework/Toolbar.vue

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

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 iconscene_map_3d" :class="{ iconjump: item.type !== '4dkk' }"></i>
+                <i class="iconfont iconedit_type_3d" :class="{ iconjump: item.type !== '4dkk' }"></i>
                 <rollName :offset="20" :active="selected.sceneCode == item.sceneCode" class="pic-name" :myref="'subw' + item.id" :name="item.sceneTitle" />
               </div>
             </li>

src/mixins/index.js

@@ -66,7 +66,7 @@ Vue.prototype.$msg.warning = (string)=>{
   });
 }
 Vue.prototype.$msg.message = (string)=>{
-  return Message.message({
+  return Message.info({
     offset:100,
     message: string,
     duration: 1000

src/pages/Edit.vue

@@ -40,3 +40,5 @@ img {
 }
 </style>
 <style lang="less" src="@/assets/style/style.pc.less"></style>
+<style lang="less" src="@/assets/style/common.less"></style>
+<style src="@/assets/fonts/iconfont.css"></style>

src/views/base/EditPanel/password.vue

@@ -10,6 +10,7 @@
                 class="ui-input"
                 placeholder="请输入访问密码，限20位"
                 :maxlength="20"
+                oninput="value=value.replace(/\s+/g,'')"
                 v-model="info.password"
               />
             <i class="iconfont icon_eye" @click="cansee=!cansee" :class="{'iconedit_input_unvisible':!cansee}"></i>

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 iconscene_map_3d" :class="{'iconjump':item.type!=='house'}"></i>
+              <i class="iconfont iconedit_type_3d" :class="{'iconjump':item.type!=='house'}"></i>
             </div>
             <div class="img">
               <img :src="item.icon" alt="">

src/views/hotspot/hotspotType/scene.vue

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

src/views/hotspot/index.vue

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

src/views/information/Toolbar.vue

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

src/views/information/index.vue

@@ -205,8 +205,9 @@ export default {
       params.forEach((item,i) => {
         let temp = this.info.scenes.find(sub=>sub.sceneCode == item.sceneCode)
         if (temp) {
+          console.log(this.$msg);
             setTimeout(() => {
-              this.$msg(`${item.type=='4dkk'?'场景':'全景图'}${item.sceneTitle}已存在,不可重复添加`);
+              this.$msg.message(`${item.type=='4dkk'?'场景':'全景图'}${item.sceneTitle}已存在,不可重复添加`);
             }, i*100);
             return
         }

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 iconscene_map_3d" :class="{'iconjump':item.type!=='house'}"></i>
+              <i class="iconfont iconedit_type_3d" :class="{'iconjump':item.type!=='house'}"></i>
             </div>
             <div class="img">
               <img :src="item.icon+`?${Math.random()}`" alt="">