tremble пре 4 година
родитељ
комит
7935d5aece

+ 1 - 0
web/.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 node_modules
 /dist
+public/data/*
 
 
 # local env files

+ 11 - 2
web/public/static/js/main_2020_show.js

@@ -15030,7 +15030,10 @@ window.Modernizr = function(n, e, t) {
                 
                 window.wx && manage.weixinShare();  
                 //初始画面
-                data.camera_start && data.camera_start.thumbImg && E(data.camera_start.thumbImg)
+                if(data.camera_start && data.camera_start.thumbImg){
+                    if(window.isLocal)data.camera_start.thumbImg = manage.dealURL(data.camera_start.thumbImg) ;
+                    E(data.camera_start.thumbImg)
+                }
                 function E(e) {
                     $("<img/>").attr("src", e).on("load", function() {
                         $("#gui-thumb").css("backgroundImage", "url(" + e + ")").fadeIn(500),
@@ -17947,7 +17950,13 @@ window.Modernizr = function(n, e, t) {
                         if (cameraMode === a.MESH) return 
                                      
                         
-                        if(window.isLocal)src = manage.dealURL(src)
+                        if(window.isLocal){
+                            src = manage.dealURL(src)
+                            //本地文件莫名少了个"."
+                            if(src[src.length-1]=='.'){
+                               src = src.slice(0,-1) 
+                            }
+                        }
                         else src = "one" === g_version ? g_Prefix + src + "?" + randomTime().getTime() :  src + "?" + randomTime().getTime()
                          
                         var l = { 

+ 4 - 9
web/public/static/js/manage.js

@@ -292,15 +292,13 @@ Manage.prototype.weixinShare = function() {
     
 }
 
-
+// window.isLocal = true
 
 Manage.prototype.dealURL = function(src, type){
-    //music: "///super.4dage.com/data/LYW/edit/20200928_151633415.mp3"
-    //"https://super.4dage.com/data/LYW/edit/20200928_165319399.jpg"]
-    
-   
     if(window.isLocal && settings.localPrefix!=void 0){//本地将线上的前缀替换
-        var oldPrefixs = ["https://super.4dage.com/", "http://super.4dage.com/", "///super.4dage.com/"]
+        src = src.replace(new RegExp('///' , "g" ),'');
+        var oldPrefixs = ["https://super.4dage.com/","https://www.4dmodel.com/SuperTwo/", "super.4dage.com/", "http://super.4dage.com/", "///super.4dage.com/"]
+
         for(let i=0;i<oldPrefixs.length;i++){
             if(src.includes(oldPrefixs[i])){
                 return src.replace(oldPrefixs[i], settings.localPrefix)
@@ -310,15 +308,12 @@ Manage.prototype.dealURL = function(src, type){
         console.error("没有找到合适的本地链接")
         return src
     }else{
-        //add https://
         var prefix = g_Prefix.replace('https://','').replace('http://','') 
         if(!src.includes('http:/') && !src.includes('https:/') && src.includes(prefix)){
             src = 'https://'+src
         }
         return src
     }
-    
-    
 }
 
 

+ 4 - 3
web/public/static/js/myShow.js

@@ -60,9 +60,10 @@ var g_weixinObj = {
 }
 
 var settings = {
-    overlay:{
-		width:1, height:0.5, depth:0.02
-	}  
+      overlay:{
+      width:1, height:0.5, depth:0.02
+    },
+  localPrefix : ''
 }
 if(window.number == '725'||window.number == '724'){
     settings.mobileNavHigh = true

+ 57 - 1
web/src/App.vue

@@ -1,5 +1,13 @@
 <template>
-    <router-view/>
+    <div class="vvvv">
+        <router-view/>
+        <div class="orientation-tip" v-if="isMobile">
+        <div>
+            <img :src="require('@/assets/images/project/landtip.png')" alt="" />
+            <p>请在竖屏模式观看</p>
+        </div>
+        </div>
+    </div>
 </template>
 
 <script>
@@ -10,4 +18,52 @@ export default {
 }
 </script>
 <style lang="less">
+.vvvv{
+    width: 100%;
+    height: 100%;
+}
+
+
+/*横屏体验*/
+.orientation-tip {
+  width: 100%;
+  height: 100%;
+  z-index: 10000;
+  position: fixed;
+  top: 0;
+  left: 0;
+  display: none;
+  background-color: rgba(0, 0, 0, 0.8);
+
+  > div {
+    position: absolute;
+    top: 50%;
+    width: 100%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    text-align: center;
+    > img {
+        width: 20%;
+    }
+    > p {
+      font-size: 16px;
+      margin-top: 20px;
+      width: 100%;
+    }
+  }
+}
+
+/*竖屏*/
+@media screen and (orientation: portrait) {
+  .orientation-tip {
+    display: none;
+  }
+}
+
+/*横屏*/
+@media screen and (orientation: landscape) {
+  .orientation-tip {
+    display: block;
+  }
+}
 </style>

BIN
web/src/assets/images/project/landtip.png


+ 7 - 1
web/src/components/hotspot/index.vue

@@ -42,12 +42,18 @@ export default {
     }
   },
   mounted(){
-    console.log(this.hotspot);
     iconArr.forEach(item => {
       if (this.hotspot[item.key]) {
         this.active = !this.active ? item.id : this.active;
+        this.hotspot[item.key] = this.hotspot[item.key].map(sub=>{
+          sub = window.manage.dealURL(sub)
+          return sub
+        })
+
       }
     });
+
+
     
     !this.active && (this.active = 'vTitle')