Просмотр исходного кода

fix:场景适配平板竖屏,横屏不做处理

aamin 1 год назад
Родитель
Сommit
aa3eeb94b7

+ 7 - 7
scene/public/static/css/css/main.css

@@ -1870,7 +1870,7 @@ hr {
     }
 }
 
-@media only screen and (max-width: 487px), (max-height:450px) {
+@media only screen and (max-width: 487px), (max-height:450px),(orientation: portrait) {
     .vr-popup.desktop {
         width: 100%;
         height: 100%;
@@ -3095,7 +3095,7 @@ ul{
     font-size: 13px
 }
 
-@media only screen and (max-width: 487px), (max-height:487px) {
+@media only screen and (max-width: 487px), (max-height:487px),(orientation: portrait) {
     #terms-modal {
         z-index: 100;
         left: 0;
@@ -3222,7 +3222,7 @@ ul{
     height: auto
 }
 
-@media only screen and (max-width: 600px), (max-height:600px) {
+@media only screen and (max-width: 600px),(orientation: portrait), (max-height:600px) {
     #quick-logo img {
         width: 150px;
         height: auto
@@ -4340,7 +4340,7 @@ a.hasHover:hover, a:active {
     }
 }
 
-@media only screen and (max-width: 487px), (max-height:487px) {
+@media only screen and (max-width: 487px), (max-height:487px),(orientation: portrait) {
     #thumb-container .thumbImg img, .frame {
         height: 77px
     }
@@ -6198,7 +6198,7 @@ a.hasHover.tag-link:hover {
     display: none
 }
 
-@media only screen and (max-width: 487px), (max-height:360px) {
+@media only screen and (max-width: 487px), (max-height:360px),(orientation: portrait) {
     #share-modal {
         position: fixed;
         top: 0;
@@ -6955,7 +6955,7 @@ a.hasHover.tag-link:hover {
     background-color: rgba(0, 0, 0, 0.5);
 }
 
-@media only screen and (max-width: 1000px) {
+@media only screen and (max-width: 1000px),(orientation: portrait) {
     .progressbar {
         width: 60%;
     }
@@ -6989,7 +6989,7 @@ a.hasHover.tag-link:hover {
     }
 }
 
-@media only screen and (max-width: 600px) {
+@media only screen and (max-width: 600px),(orientation: portrait) {
     #gui-modes-map>div[rel]:hover, #play:hover {
         background: transparent;
     }

+ 6 - 6
scene/public/static/css/css/sceen2.css

@@ -1868,7 +1868,7 @@ hr {
   }
 }
 
-@media only screen and (max-width: 487px),(max-height:450px) {
+@media only screen and (max-width: 487px),(max-height:450px),(orientation: portrait) {
   .vr-popup.desktop {
       width:100%;
       height: 100%;
@@ -3034,7 +3034,7 @@ body,html {
   font-size: 13px
 }
 
-@media only screen and (max-width: 487px),(max-height:487px) {
+@media only screen and (max-width: 487px),(max-height:487px),(orientation: portrait) {
   #terms-modal {
       z-index:100;
       left: 0;
@@ -3161,7 +3161,7 @@ body,html {
   height: auto
 }
 
-@media only screen and (max-width: 600px),(max-height:600px) {
+@media only screen and (max-width: 600px),(orientation: portrait),(max-height:600px) {
   #quick-logo img {
       width:150px;
       height: auto
@@ -4261,7 +4261,7 @@ a.hasHover:hover,a:active {
   }
 }
 
-@media only screen and (max-width: 487px),(max-height:487px) {
+@media only screen and (max-width: 487px),(max-height:487px),(orientation: portrait) {
   #thumb-container .thumbImg img,.frame {
       height:77px
   }
@@ -6142,7 +6142,7 @@ a.hasHover.tag-link:hover {
   display: none
 }
 
-@media only screen and (max-width: 487px),(max-height:360px) {
+@media only screen and (max-width: 487px),(max-height:360px),(orientation: portrait) {
   #share-modal {
       position:fixed;
       top: 0;
@@ -6995,7 +6995,7 @@ background-size: 100% 100%;
       justify-content:center;
   }
 }
-@media only screen and (max-width: 600px) {
+@media only screen and (max-width: 600px),(orientation: portrait) {
   /* #gui-modes-map >div[rel]:hover,#play:hover{ background:transparent;  } */
   .pinBottom.right .ui-icon{ margin-right: 5px; }
   .pinBottom.right,.pinBottom.left{bottom: 5px;}

+ 7 - 6
scene/public/static/css/main.css

@@ -2175,7 +2175,7 @@ j .vr-popup.tinier.supported.landscape.details-page .inner {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:450px) {
+(max-height:450px),(orientation: portrait) {
     .vr-popup.desktop {
         width: 100%;
         height: 100%;
@@ -3535,7 +3535,7 @@ ul {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:487px) {
+(max-height:487px),(orientation: portrait) {
     #terms-modal {
         z-index: 100;
         left: 0;
@@ -3667,6 +3667,7 @@ ul {
 }
 
 @media only screen and (max-width: 600px),
+(orientation: portrait),
 (max-height:600px) {
     #quick-logo img {
         width: 150px;
@@ -4847,7 +4848,7 @@ a.tag-link {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:487px) {
+(max-height:487px),(orientation: portrait) {
     .frame {
         height: 107px;
         display: block;
@@ -6941,7 +6942,7 @@ a.hasHover.tag-link:hover {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:360px) {
+(max-height:360px),(orientation: portrait) {
     #share-modal {
         position: fixed;
         top: 0;
@@ -7754,7 +7755,7 @@ a.hasHover.tag-link:hover {
     background-color: rgba(0, 0, 0, 0.5);
 }
 
-@media only screen and (max-width: 1000px) {
+@media only screen and (max-width: 1000px),(orientation: portrait) {
     .progressbar {
         width: 60%;
     }
@@ -7797,7 +7798,7 @@ a.hasHover.tag-link:hover {
     }
 }
 
-@media only screen and (max-width: 600px) {
+@media only screen and (max-width: 600px),(orientation: portrait) {
 
     #gui-modes-map>div[rel]:hover,
     #play:hover {

+ 6 - 5
scene/public/static/css/sceen2.css

@@ -2184,7 +2184,7 @@ j .vr-popup.tinier.supported.landscape.details-page .inner {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:450px) {
+(max-height:450px),(orientation: portrait) {
   .vr-popup.desktop {
     width: 100%;
     height: 100%;
@@ -3434,7 +3434,7 @@ html {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:487px) {
+(max-height:487px),(orientation: portrait) {
   #terms-modal {
     z-index: 100;
     left: 0;
@@ -3566,6 +3566,7 @@ html {
 }
 
 @media only screen and (max-width: 600px),
+(orientation: portrait),
 (max-height:600px) {
   #quick-logo img {
     width: 150px;
@@ -4777,7 +4778,7 @@ a.tag-link {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:487px) {
+(max-height:487px),(orientation: portrait) {
 
   #thumb-container .thumbImg img,
   .frame {
@@ -6773,7 +6774,7 @@ a.hasHover.tag-link:hover {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:360px) {
+(max-height:360px),(orientation: portrait) {
   #share-modal {
     position: fixed;
     top: 0;
@@ -7747,7 +7748,7 @@ span.nav-icon-name {
   }
 }
 
-@media only screen and (max-width: 600px) {
+@media only screen and (max-width: 600px),(orientation: portrait) {
 
   /* #gui-modes-map >div[rel]:hover,#play:hover{ background:transparent;  } */
   .pinBottom.right .ui-icon {

+ 2 - 2
scene/public/static/js/loadCAD.js

@@ -66,13 +66,13 @@ window.grendCAD = (function grendCAD() {
 
      
 
-      @media only screen and (max-width: 1000px) { 
+      @media only screen and (max-width: 1000px),(orientation: portrait) { 
         .cad {
           position: absolute;
           left:auto;
           transform: translate(0, 0);
           right: 10px;
-          top: 10px;
+          top: 10%;
           width: 120px;
           height: 120px;
           background:  rgba(56,56,56,0.56);

+ 1 - 1
scene/src/assets/style/myBase.css

@@ -71,7 +71,7 @@
   display: none !important;
 }
 
-@media screen and (max-width: 1000px) {
+@media screen and (max-width: 1000px),(orientation: portrait) {
   #drawer.open.noScroll {
     height: 118px !important;
   }

+ 1 - 1
scene/src/assets/style/public.css

@@ -79,7 +79,7 @@ input:-ms-input-placeholder {
   height: 100%;
   margin-top: -20px;
 }
-@media only screen and (max-width: 487px), (max-height: 487px) {
+@media only screen and (max-width: 487px), (max-height: 487px),(orientation: portrait) {
   .cad {
     position: fixed;
     top: 38%;

+ 1 - 1
scene/src/components/info/index.vue

@@ -106,7 +106,7 @@ export default {
   }
 }
 
-@media screen and (max-width: 1000px) {
+@media screen and (max-width: 1000px),(orientation: portrait) {
   .info-box {
     // height: 58px;
     width: 70%;

+ 1 - 1
scene/src/views/gui/components/hotList.vue

@@ -127,7 +127,7 @@ export default {
     }
   }
 }
-@media screen and (max-width: 1000px) {
+@media screen and (max-width: 1000px),(orientation: portrait) {
   .hotList {
     width: 100vw;
     height: 60%;

+ 41 - 27
scene/src/views/gui/components/share.vue

@@ -7,8 +7,7 @@
     <div class="main" id="canvsBox" v-else>
       <!-- 数字 -->
       <div class="txt">
-        第&nbsp;&nbsp;<span>{{ num }}</span
-        >&nbsp;&nbsp;位参与者
+        第&nbsp;&nbsp;<span>{{ num }}</span>&nbsp;&nbsp;位参与者
       </div>
       <!-- 二维码 -->
       <div class="code">
@@ -16,12 +15,8 @@
       </div>
     </div>
     <!-- 加载中 -->
-    <div
-      class="logingBox"
-      v-loading="!isOk"
-      element-loading-text="生成海报中"
-      element-loading-background="rgba(0, 0, 0, 0.8)"
-    ></div>
+    <div class="logingBox" v-loading="!isOk" element-loading-text="生成海报中" element-loading-background="rgba(0, 0, 0, 0.8)">
+    </div>
     <div class="close" @click="$emit('close')">
       <img src="../../../assets/img/close.png" alt="" />
     </div>
@@ -73,14 +68,14 @@ export default {
       console.log(e);
     }
   },
-  mounted() {},
-  beforeCreate() {}, //生命周期 - 创建之前
-  beforeMount() {}, //生命周期 - 挂载之前
-  beforeUpdate() {}, //生命周期 - 更新之前
-  updated() {}, //生命周期 - 更新之后
-  beforeDestroy() {}, //生命周期 - 销毁之前
-  destroyed() {}, //生命周期 - 销毁完成
-  activated() {}, //如果页面有keep-alive缓存功能,这个函数会触发
+  mounted() { },
+  beforeCreate() { }, //生命周期 - 创建之前
+  beforeMount() { }, //生命周期 - 挂载之前
+  beforeUpdate() { }, //生命周期 - 更新之前
+  updated() { }, //生命周期 - 更新之后
+  beforeDestroy() { }, //生命周期 - 销毁之前
+  destroyed() { }, //生命周期 - 销毁完成
+  activated() { }, //如果页面有keep-alive缓存功能,这个函数会触发
 };
 </script>
 <style lang='less' scoped>
@@ -91,15 +86,18 @@ export default {
   transform: translate(-50%, -50%);
   width: 542px;
   height: 820px;
+
   .imgBox {
     width: 100%;
     height: 100%;
     position: relative;
-    & > img {
+
+    &>img {
       width: 100%;
       height: 100%;
     }
-    & > p {
+
+    &>p {
       position: absolute;
       bottom: 10px;
       right: 34px;
@@ -109,6 +107,7 @@ export default {
       text-align: center;
     }
   }
+
   .logingBox {
     position: absolute;
     top: 0;
@@ -117,33 +116,39 @@ export default {
     height: 100%;
     z-index: 99;
   }
+
   .main {
     width: 100%;
     height: 100%;
     background-image: url("../../../assets/img/open/bg-share.jpg");
     background-size: 100% 100%;
     position: relative;
+
     .txt {
       position: absolute;
       bottom: 185px;
       right: 30px;
       color: #d6b970;
-      & > span {
+
+      &>span {
         font-size: 36px;
         font-weight: 700;
       }
     }
+
     .code {
       position: absolute;
       bottom: 60px;
       right: 34px;
       width: 80px;
-      & > img {
+
+      &>img {
         border-radius: 6px;
         width: 80px;
       }
     }
   }
+
   .close {
     z-index: 99;
     position: absolute;
@@ -152,14 +157,17 @@ export default {
     cursor: pointer;
   }
 }
+
 // 移动端
-@media screen and (max-width: 1000px) {
+@media screen and (max-width: 1000px),
+(orientation: portrait) {
   .share {
     max-width: 500px;
     width: 90%;
     height: 90%;
+
     .imgBox {
-      & > p {
+      &>p {
         font-size: 12px;
         bottom: 10px;
         width: 120px;
@@ -167,6 +175,7 @@ export default {
         text-align: right;
       }
     }
+
     .main {
       // background-image: url("../../../assets/img/open/bg-shareM.jpg");
       // background-size: 100% 100%;
@@ -174,19 +183,23 @@ export default {
       .txt {
         bottom: 24%;
         right: 14px;
-        & > span {
+
+        &>span {
           font-size: 24px;
         }
       }
+
       .code {
         width: 84px;
         bottom: 30px;
         right: 14px;
-        & > img {
+
+        &>img {
           width: 84px;
         }
       }
     }
+
     .close {
       position: absolute;
       right: -14px;
@@ -195,16 +208,17 @@ export default {
     }
   }
 }
+
 @media screen and (max-width: 370px) {
   .share {
     .main {
       .txt {
         font-size: 12px;
-        & > span {
+
+        &>span {
           font-size: 18px;
         }
       }
     }
   }
-}
-</style>
+}</style>

+ 6 - 6
scene/src/views/gui/menu.vue

@@ -28,7 +28,7 @@
             <a>
               <img rel="tooltip" title="" :src="require('@/assets/images/icon/pause.png')" width="24" height="24"
                 data-original-title="暂停" />
-              <div class="btmText" :style="{ marginLeft: screenWidth < 700 ? '0px' : '-12px' }">自动漫游</div>
+              <div class="btmText" :style="{ marginLeft: screenWidth < 1280 ? '0px' : '-12px' }">自动漫游</div>
             </a>
           </div>
           <div id="next" class="next desktop-only ui-icon wide" style="display: none">
@@ -477,7 +477,7 @@ export default {
   >div {
     margin-right: @margin;
 
-    @media screen and (max-width: 700px) {
+    @media screen and (max-width: 700px),(orientation: portrait) {
       margin-bottom: @margin;
     }
 
@@ -544,7 +544,7 @@ export default {
   display: flex;
   justify-content: center;
 
-  @media screen and (max-width: 700px) {
+  @media screen and (max-width: 700px),(orientation: portrait) {
     width: 50px;
   }
 
@@ -552,7 +552,7 @@ export default {
     width: @wh;
     margin-bottom: 5px;
 
-    @media screen and (max-width: 700px) {
+    @media screen and (max-width: 700px),(orientation: portrait) {
       margin-bottom: 10px !important;
     }
   }
@@ -565,7 +565,7 @@ export default {
 }
 
 .toHomeBox2 {
-  @media screen and (max-width: 700px) {
+  @media screen and (max-width: 700px),(orientation: portrait) {
     margin: 10px 0;
   }
 }
@@ -602,7 +602,7 @@ export default {
 }
 
 // 移动端
-@media screen and (max-width: 1000px) {
+@media screen and (max-width: 1000px),(orientation: portrait) {
   .hoverTit {
     opacity: 0 !important;
   }

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
zhengquan/public/scene/css/app.f2adc968.css


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
zhengquan/public/scene/index.html


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
zhengquan/public/scene/js/app.a0498f6e.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 1
zhengquan/public/scene/js/app.d52a9c4e.js


+ 7 - 7
zhengquan/public/scene/static/css/css/main.css

@@ -1870,7 +1870,7 @@ hr {
     }
 }
 
-@media only screen and (max-width: 487px), (max-height:450px) {
+@media only screen and (max-width: 487px), (max-height:450px),(orientation: portrait) {
     .vr-popup.desktop {
         width: 100%;
         height: 100%;
@@ -3095,7 +3095,7 @@ ul{
     font-size: 13px
 }
 
-@media only screen and (max-width: 487px), (max-height:487px) {
+@media only screen and (max-width: 487px), (max-height:487px),(orientation: portrait) {
     #terms-modal {
         z-index: 100;
         left: 0;
@@ -3222,7 +3222,7 @@ ul{
     height: auto
 }
 
-@media only screen and (max-width: 600px), (max-height:600px) {
+@media only screen and (max-width: 600px),(orientation: portrait), (max-height:600px) {
     #quick-logo img {
         width: 150px;
         height: auto
@@ -4340,7 +4340,7 @@ a.hasHover:hover, a:active {
     }
 }
 
-@media only screen and (max-width: 487px), (max-height:487px) {
+@media only screen and (max-width: 487px), (max-height:487px),(orientation: portrait) {
     #thumb-container .thumbImg img, .frame {
         height: 77px
     }
@@ -6198,7 +6198,7 @@ a.hasHover.tag-link:hover {
     display: none
 }
 
-@media only screen and (max-width: 487px), (max-height:360px) {
+@media only screen and (max-width: 487px), (max-height:360px),(orientation: portrait) {
     #share-modal {
         position: fixed;
         top: 0;
@@ -6955,7 +6955,7 @@ a.hasHover.tag-link:hover {
     background-color: rgba(0, 0, 0, 0.5);
 }
 
-@media only screen and (max-width: 1000px) {
+@media only screen and (max-width: 1000px),(orientation: portrait) {
     .progressbar {
         width: 60%;
     }
@@ -6989,7 +6989,7 @@ a.hasHover.tag-link:hover {
     }
 }
 
-@media only screen and (max-width: 600px) {
+@media only screen and (max-width: 600px),(orientation: portrait) {
     #gui-modes-map>div[rel]:hover, #play:hover {
         background: transparent;
     }

+ 2 - 2
zhengquan/public/scene/static/css/css/oldVer/main0.css

@@ -151,8 +151,8 @@ iframe{
 }
 @media screen and  (max-width:667px){
 	#closepop{
-		width: 36px;
-		height: 36px;
+		width: 40px;
+		height: 40px;
 		top: 0px;
 		right: 0px;
 	}

+ 6 - 6
zhengquan/public/scene/static/css/css/sceen2.css

@@ -1868,7 +1868,7 @@ hr {
   }
 }
 
-@media only screen and (max-width: 487px),(max-height:450px) {
+@media only screen and (max-width: 487px),(max-height:450px),(orientation: portrait) {
   .vr-popup.desktop {
       width:100%;
       height: 100%;
@@ -3034,7 +3034,7 @@ body,html {
   font-size: 13px
 }
 
-@media only screen and (max-width: 487px),(max-height:487px) {
+@media only screen and (max-width: 487px),(max-height:487px),(orientation: portrait) {
   #terms-modal {
       z-index:100;
       left: 0;
@@ -3161,7 +3161,7 @@ body,html {
   height: auto
 }
 
-@media only screen and (max-width: 600px),(max-height:600px) {
+@media only screen and (max-width: 600px),(orientation: portrait),(max-height:600px) {
   #quick-logo img {
       width:150px;
       height: auto
@@ -4261,7 +4261,7 @@ a.hasHover:hover,a:active {
   }
 }
 
-@media only screen and (max-width: 487px),(max-height:487px) {
+@media only screen and (max-width: 487px),(max-height:487px),(orientation: portrait) {
   #thumb-container .thumbImg img,.frame {
       height:77px
   }
@@ -6142,7 +6142,7 @@ a.hasHover.tag-link:hover {
   display: none
 }
 
-@media only screen and (max-width: 487px),(max-height:360px) {
+@media only screen and (max-width: 487px),(max-height:360px),(orientation: portrait) {
   #share-modal {
       position:fixed;
       top: 0;
@@ -6995,7 +6995,7 @@ background-size: 100% 100%;
       justify-content:center;
   }
 }
-@media only screen and (max-width: 600px) {
+@media only screen and (max-width: 600px),(orientation: portrait) {
   /* #gui-modes-map >div[rel]:hover,#play:hover{ background:transparent;  } */
   .pinBottom.right .ui-icon{ margin-right: 5px; }
   .pinBottom.right,.pinBottom.left{bottom: 5px;}

+ 7 - 6
zhengquan/public/scene/static/css/main.css

@@ -2175,7 +2175,7 @@ j .vr-popup.tinier.supported.landscape.details-page .inner {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:450px) {
+(max-height:450px),(orientation: portrait) {
     .vr-popup.desktop {
         width: 100%;
         height: 100%;
@@ -3535,7 +3535,7 @@ ul {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:487px) {
+(max-height:487px),(orientation: portrait) {
     #terms-modal {
         z-index: 100;
         left: 0;
@@ -3667,6 +3667,7 @@ ul {
 }
 
 @media only screen and (max-width: 600px),
+(orientation: portrait),
 (max-height:600px) {
     #quick-logo img {
         width: 150px;
@@ -4847,7 +4848,7 @@ a.tag-link {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:487px) {
+(max-height:487px),(orientation: portrait) {
     .frame {
         height: 107px;
         display: block;
@@ -6941,7 +6942,7 @@ a.hasHover.tag-link:hover {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:360px) {
+(max-height:360px),(orientation: portrait) {
     #share-modal {
         position: fixed;
         top: 0;
@@ -7754,7 +7755,7 @@ a.hasHover.tag-link:hover {
     background-color: rgba(0, 0, 0, 0.5);
 }
 
-@media only screen and (max-width: 1000px) {
+@media only screen and (max-width: 1000px),(orientation: portrait) {
     .progressbar {
         width: 60%;
     }
@@ -7797,7 +7798,7 @@ a.hasHover.tag-link:hover {
     }
 }
 
-@media only screen and (max-width: 600px) {
+@media only screen and (max-width: 600px),(orientation: portrait) {
 
     #gui-modes-map>div[rel]:hover,
     #play:hover {

+ 6 - 5
zhengquan/public/scene/static/css/sceen2.css

@@ -2184,7 +2184,7 @@ j .vr-popup.tinier.supported.landscape.details-page .inner {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:450px) {
+(max-height:450px),(orientation: portrait) {
   .vr-popup.desktop {
     width: 100%;
     height: 100%;
@@ -3434,7 +3434,7 @@ html {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:487px) {
+(max-height:487px),(orientation: portrait) {
   #terms-modal {
     z-index: 100;
     left: 0;
@@ -3566,6 +3566,7 @@ html {
 }
 
 @media only screen and (max-width: 600px),
+(orientation: portrait),
 (max-height:600px) {
   #quick-logo img {
     width: 150px;
@@ -4777,7 +4778,7 @@ a.tag-link {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:487px) {
+(max-height:487px),(orientation: portrait) {
 
   #thumb-container .thumbImg img,
   .frame {
@@ -6773,7 +6774,7 @@ a.hasHover.tag-link:hover {
 }
 
 @media only screen and (max-width: 487px),
-(max-height:360px) {
+(max-height:360px),(orientation: portrait) {
   #share-modal {
     position: fixed;
     top: 0;
@@ -7747,7 +7748,7 @@ span.nav-icon-name {
   }
 }
 
-@media only screen and (max-width: 600px) {
+@media only screen and (max-width: 600px),(orientation: portrait) {
 
   /* #gui-modes-map >div[rel]:hover,#play:hover{ background:transparent;  } */
   .pinBottom.right .ui-icon {

+ 1 - 1
zhengquan/public/scene/static/js/Hot.js

@@ -14,7 +14,7 @@ let playVideoMax = window.isEdit ? 3  :   browser.isMobile() ? 1 : 2;
 let playAniMax = window.isEdit ? 6 :   browser.isMobile() ? 3 : 5;
 
 if(number == 'SHANGJJ'){
-    playSyncGroup = ['okh1UR466371',  'LGmLHP2615503' ,  'VNyBI6614896'] //中,左,右 
+    playSyncGroup = [['okh1UR466371',  'LGmLHP2615503' ,  'VNyBI6614896']] //中,左,右 
     playVideoMax = 3
 }
 

+ 4 - 4
zhengquan/public/scene/static/js/loadCAD.js

@@ -31,7 +31,7 @@ window.grendCAD = (function grendCAD() {
     let $name = document.createElement("div");
 
     $name.className = "name";
-    $name.textContent = "当前位置:元大都展";
+    $name.textContent = "";
     $layer.appendChild($name);
 
     $layer.className = "cad";
@@ -43,7 +43,7 @@ window.grendCAD = (function grendCAD() {
       .cad {
         position: absolute;
         right: 20px;
-        top: 20px;
+        top: 10%;
         width: 180px;
         height: 180px;
         background:  rgba(56,56,56,0.56);
@@ -66,13 +66,13 @@ window.grendCAD = (function grendCAD() {
 
      
 
-      @media only screen and (max-width: 1000px) { 
+      @media only screen and (max-width: 1000px),(orientation: portrait) { 
         .cad {
           position: absolute;
           left:auto;
           transform: translate(0, 0);
           right: 10px;
-          top: 10px;
+          top: 10%;
           width: 120px;
           height: 120px;
           background:  rgba(56,56,56,0.56);

+ 4 - 2
zhengquan/src/views/Scene/ScenePage.vue

@@ -972,7 +972,8 @@ const changePassFu = () => {
       backdrop-filter: blur(10px);
       border-radius: 15px 0 0 0;
 
-      @media screen and (max-width:700) {
+      @media screen and (max-width:700),
+      (orientation: portrait) {
         border-radius: 0 0 0 0;
       }
 
@@ -1002,7 +1003,8 @@ const changePassFu = () => {
       .left-item:first-child {
         border-radius: 15px 0 0 0;
 
-        @media screen and (max-width:700) {
+        @media screen and (max-width:700),
+        (orientation: portrait) {
           border-radius: 0 0 0 0;
         }
       }

+ 1 - 1
zhengquan/src/views/UnitWall/components/unitList.vue

@@ -201,7 +201,7 @@ watch(curProject, (newValue: string) => {
           </div>
           <div v-if="startItem + item - 1 < store.dataAll.welfareList.length"
             :class="store.dataAll.welfareList[startItem + item - 1].title.length > 8 ? 'item-name' : ''"
-            :style="{ whiteSpace: 'nowrap', marginTop: '-0.2vh' }"> {{ store.dataAll.welfareList[startItem + item -
+            :style="{ whiteSpace: 'nowrap', marginTop: '0' }"> {{ store.dataAll.welfareList[startItem + item -
               1] ? store.dataAll.welfareList[startItem + item - 1].title : '' }}</div>
         </div>
       </div>