Bladeren bron

更新本地版

aamin 1 jaar geleden
bovenliggende
commit
a1570eb1c5

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

@@ -831,7 +831,7 @@ hr {
 
 .icon-fullscreen-exit:before {
     content: "";
-    background: url("https://super.4dage.com/images/narrow_off.png") center top no-repeat;
+    background: url("../../images/narrow_off.png") center top no-repeat;
     background-size: 100%;
     display: inline-block;
     width: 24px;
@@ -840,7 +840,7 @@ hr {
 
 .icon-fullscreen:before {
     content: "";
-    background: url("https://super.4dage.com/images/enlarge_on.png")center top no-repeat;
+    background: url("../../images/enlarge_on.png")center top no-repeat;
     background-size: 100%;
     display: inline-block;
     width: 24px;

+ 1 - 1
scene/public/static/css/css/oldVer/main0.css

@@ -52,7 +52,7 @@ iframe{
 	opacity:0.1; 
 }
 #closepop {
-	background: url(https://super.4dage.com/images/close1.png) no-repeat;
+	background: url('../../../images/close1.png') no-repeat;
 	width: 60px;
 	height: 60px;
 	cursor: pointer;

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

@@ -15,7 +15,7 @@ window.grendCAD = (function grendCAD() {
     if (initScript) return cb()
 
     let $script = document.createElement('script')
-    $script.src = '//www.4dmodel.com/CAD/bundle.js'
+    $script.src = 'static/js/bundle.js'
     $script.onload = function () {
       initScript = true
       cb()

+ 8 - 2
scene/public/static/js/main_2020_show.js

@@ -14478,7 +14478,7 @@ window.Modernizr = function(n, e, t) {
                 
                 window.wx && manage.weixinShare();  
                 //初始画面
-                data.camera_start && data.camera_start.thumbImg &&  E(manage.dealURL(data.camera_start.thumbImg))
+                data.camera_start && data.camera_start.thumbImg && E(manage.dealURL(data.camera_start.thumbImg))
                 function E(e) {
                     $("<img/>").attr("src", e).on("load", function() {
                         $("#gui-thumb").css("backgroundImage", "url(" + e + ")").fadeIn(500),
@@ -17093,7 +17093,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 = { 

+ 6 - 2
scene/public/static/js/manage.js

@@ -1,10 +1,13 @@
   
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-var g_Prefix="https://super.4dage.com/";
+// var g_Prefix="https://super.4dage.com/";
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
+var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/scene1")+1);
+
 var s = window.location.href.split('/');
     s.pop();
 //var g_Prefix = s.join('/');
+window.isLocal = true
 var g_index=null;
 var g_modeldata=null;
 
@@ -93,6 +96,7 @@ var settings = {
     hotFastTran:false,
     transparentBg: false,
     bgImg:  null,
+    localPrefix: '',
      
     tileClass:{//默认全景贴图加载的清晰度
         pc:{
@@ -671,7 +675,7 @@ var Manage = function(){
     this.weixinURL = "https://res.wx.qq.com/open/js/jweixin-1.2.0.js",
     this.time = "?"+new Date().getTime();
     this.loadAudio();
-    this.loadWeixin();
+    // this.loadWeixin();
 }
 //动态加载js文件
 Manage.prototype.LoadJs = function(_files, succes){

+ 2 - 1
scene/public/static/js/myShow.js

@@ -1,6 +1,7 @@
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-var g_Prefix="https://super.4dage.com/";
+// var g_Prefix="https://super.4dage.com/";
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
+var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/scene1")+1);
 var s = window.location.href.split('/');
 s.pop();
 //var g_Prefix = s.join('/');

+ 2 - 2
scene2/public/static/css/css/main.css

@@ -831,7 +831,7 @@ hr {
 
 .icon-fullscreen-exit:before {
     content: "";
-    background: url("https://super.4dage.com/images/narrow_off.png") center top no-repeat;
+    background: url("../../images/narrow_off.png") center top no-repeat;
     background-size: 100%;
     display: inline-block;
     width: 24px;
@@ -840,7 +840,7 @@ hr {
 
 .icon-fullscreen:before {
     content: "";
-    background: url("https://super.4dage.com/images/enlarge_on.png")center top no-repeat;
+    background: url("../../images/enlarge_on.png")center top no-repeat;
     background-size: 100%;
     display: inline-block;
     width: 24px;

+ 1 - 1
scene2/public/static/css/css/oldVer/main0.css

@@ -52,7 +52,7 @@ iframe{
 	opacity:0.1; 
 }
 #closepop {
-	background: url(https://super.4dage.com/images/close1.png) no-repeat;
+	background: url('../../../images/close1.png') no-repeat;
 	width: 60px;
 	height: 60px;
 	cursor: pointer;

+ 1 - 1
scene2/public/static/js/loadCAD.js

@@ -15,7 +15,7 @@ window.grendCAD = (function grendCAD() {
     if (initScript) return cb()
 
     let $script = document.createElement('script')
-    $script.src = '//www.4dmodel.com/CAD/bundle.js'
+    $script.src = 'static/js/bundle.js'
     $script.onload = function () {
       initScript = true
       cb()

+ 8 - 2
scene2/public/static/js/main_2020_show.js

@@ -14478,7 +14478,7 @@ window.Modernizr = function(n, e, t) {
                 
                 window.wx && manage.weixinShare();  
                 //初始画面
-                data.camera_start && data.camera_start.thumbImg &&  E(manage.dealURL(data.camera_start.thumbImg))
+                data.camera_start && data.camera_start.thumbImg && E(manage.dealURL(data.camera_start.thumbImg))
                 function E(e) {
                     $("<img/>").attr("src", e).on("load", function() {
                         $("#gui-thumb").css("backgroundImage", "url(" + e + ")").fadeIn(500),
@@ -17093,7 +17093,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 = { 

+ 5 - 3
scene2/public/static/js/manage.js

@@ -1,9 +1,10 @@
   
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-var g_Prefix="https://super.4dage.com/";
-// var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
+// var g_Prefix="https://super.4dage.com/";
+var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/scene2")+1);
 var s = window.location.href.split('/');
     s.pop();
+window.isLocal = true
 //var g_Prefix = s.join('/');
 var g_index=null;
 var g_modeldata=null;
@@ -93,6 +94,7 @@ var settings = {
     hotFastTran:false,
     transparentBg: false,
     bgImg:  null,
+    localPrefix: '',
      
     tileClass:{//默认全景贴图加载的清晰度
         pc:{
@@ -671,7 +673,7 @@ var Manage = function(){
     this.weixinURL = "https://res.wx.qq.com/open/js/jweixin-1.2.0.js",
     this.time = "?"+new Date().getTime();
     this.loadAudio();
-    this.loadWeixin();
+    // this.loadWeixin();
 }
 //动态加载js文件
 Manage.prototype.LoadJs = function(_files, succes){

+ 3 - 2
scene2/public/static/js/myShow.js

@@ -1,7 +1,8 @@
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-var g_Prefix="https://super.4dage.com/";
-// var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
+// var g_Prefix="https://super.4dage.com/";
+var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/scene2")+1);
 var s = window.location.href.split('/');
+window.isLocal = true
 s.pop();
 //var g_Prefix = s.join('/');
 var g_index=null;

+ 1 - 1
zdkkc/src/views/Scene/scenePage.vue

@@ -48,7 +48,7 @@ onMounted(() => {
 
 <template>
   <div class="scene-box">
-    <iframe :src="`./scenePage/index.html?m=${curCode}`"></iframe>
+    <iframe :src="`../scene1/index.html?m=${curCode}`"></iframe>
   </div>
 
 </template>

+ 1 - 1
zdkkc2/src/views/Scene/scenePage.vue

@@ -47,7 +47,7 @@ onMounted(() => {
 
 <template>
   <div class="scene-box">
-    <iframe :src="`./scenePage/index.html?m=${curCode ? curCode : 'KJ-VfABdXXAzvy'}`"></iframe>
+    <iframe :src="`../scene2/index.html?m=${curCode ? curCode : 'KJ-VfABdXXAzvy'}`"></iframe>
   </div>
 </template>