1138更新

src/components/rollName/index.vue

@@ -82,11 +82,12 @@ export default {
     vertical-align:unset;
   }
   .shenglv{
-    text-overflow: ellipsis;
+    // text-overflow: ellipsis;
     overflow: hidden;
-    white-space: nowrap;
-    line-height: 100%;
+    // white-space: nowrap;
+    // line-height: 100%;
     vertical-align: baseline;
+    padding-left: 0px;
   }
 }
 </style>

src/framework/show/list.vue

@@ -47,7 +47,7 @@
         </ul>
       </div>
     </div>
-    <div class="btn dl"  v-if="!(showInfo.catalogRoot.length == 1 && scenes.length == 1 && showInfo.catalogs.length == 1)" @click="showList = !showList"><i class="iconfont " :class="showList ? 'iconnav_scene_down' : 'iconnav_scene_up'"></i>场景导航</div>
+    <div class="btn dl" :class="{deepbg:showList}" v-if="!(showInfo.catalogRoot.length == 1 && scenes.length == 1 && showInfo.catalogs.length == 1)" @click="showList = !showList"><i class="iconfont " :class="showList ? 'iconnav_scene_down' : 'iconnav_scene_up'"></i>场景导航</div>
   </div>
 </template>
 
@@ -312,6 +312,10 @@ export default {
       font-size: 18px;
     }
   }
+
+  .deepbg{
+    background: rgba(0, 0, 0, 0.5);
+  }
   .l-con {
     width: 100%;
     transition: all ease 0.3s;
@@ -343,15 +347,17 @@ export default {
     .pp-tap {
       padding: 0 0 16px;
       > li {
-        max-width: 100px;
+        max-width: 84px;
+        margin: 0 10px;
+
       }
     }
     .tap {
-      padding: 16px 0;
+      padding: 20px 0 16px;
 
       > li {
         position: relative;
-        width: 116px;
+        width: 104px;
         .btn{
           width: 100%;
           padding: 0;
@@ -368,7 +374,7 @@ export default {
             border-right:  @size * 1.5 solid transparent;
             border-top:  @size*2 solid rgba(0, 0, 0, 0.5);
             position: absolute;
-            top: -18px;
+            top: -20px;
             left: 50%;
             transform: translateX(-50%);
           }

src/framework/show/popup/preview.vue

@@ -1,7 +1,7 @@
 <template>
     <popup v-if="show">
       <div class="ui-message ui-message-confirm" 
-      :style="{width: typeW[item.hotspotType]}">
+      :style="{width: typeW[item.hotspotType]}"  :class="{'txtui-confirm':item.hotspotType=='textarea'}" >
         <div class="ui-message-header">
           <span>{{item.hotspotTitle}}</span>
           <span @click="$emit('close')">
@@ -54,6 +54,7 @@ export default {
       pano:'960px',
       audio:'430px',
       video:'960px',
+      
     }
     return {
       typeStr,
@@ -138,6 +139,26 @@ export default {
 
   }
 }
+
+.txtui-confirm{
+  width: 430px;
+   .ui-message-header{
+    border-bottom: 1px solid #EBEBEB;
+    padding: 12px 20px 12px 30px;
+    >span{
+      margin: 0;
+    }
+  }
+  .ui-message-main{
+    width: 330px;
+    margin: 20px auto;
+    padding: 0;
+    background: #fff;
+    .v-textarea{
+      padding: 0;
+    }
+  }
+}
 </style>
 
 <style lang="less" scoped>

src/framework/showMobile/list.vue

@@ -59,7 +59,7 @@
     </div>
 
     <template  v-else>
-      <div class="btn dl" v-if="!(showInfo.catalogRoot.length == 1 && scenes.length == 1 && showInfo.catalogs.length == 1)" @click="showList = !showList">
+      <div class="btn dl" :class="{deepbg:showList}" v-if="!(showInfo.catalogRoot.length == 1 && scenes.length == 1 && showInfo.catalogs.length == 1)" @click="showList = !showList">
         <i class="iconfont " :class="showList?'iconnav_scene_down':'iconnav_scene_up'"></i>场景导航
       </div>
     </template>
@@ -364,6 +364,9 @@ export default {
     }
   }
 
+  .deepbg{
+    background: rgba(0, 0, 0, 0.5);
+  }
   .menu{
     margin: 10px 0 12px;
     .menucon{

src/utils/request.js

@@ -143,7 +143,8 @@ export function statusCodesHandler(result, callback) {
   }
 
   if (result.code == statusCode.FAILURE_CODE_5004) {
-    return $alert({ content: "密码错误" });
+          return vue.$msg.error("密码错误");
+          // return vue.({ content: "密码错误" });
   }
 
   if (result.code == statusCode.FAILURE_CODE_5001) {