소스 검색

本地化部署ok

shaogen1995 2 년 전
부모
커밋
7089742dca

+ 24 - 6
hot/src/views/Home.vue

@@ -6,7 +6,7 @@
           id="myAudio"
           v-if="audio"
           v-show="isOneAduio"
-          :src="audio"
+          :src="urlToFitFu(audio)"
           controls
         ></audio>
         <!-- 音频图标 -->
@@ -79,19 +79,23 @@
             <!-- 模型页面 -->
             <div class="modelBox" v-if="myType === 'model'">
               <iframe
-                :src="item"
+                :src="urlToFitFu(item)"
                 frameborder="0"
                 v-if="index === myInd"
               ></iframe>
             </div>
             <!-- 视频页面 -->
             <div class="videoBox" v-else-if="myType === 'video'">
-              <video controls :src="item.url" v-if="index === myInd"></video>
+              <video
+                controls
+                :src="urlToFitFu(item.url)"
+                v-if="index === myInd"
+              ></video>
             </div>
             <!-- 图片页面 -->
             <div class="imgBox" v-else-if="myType === 'img'">
-              <div class="smImgBox" @click="lookImg(item)">
-                <img v-lazy="item" alt="" />
+              <div class="smImgBox" @click="lookImg(urlToFitFu(item))">
+                <img v-lazy="urlToFitFu(item)" alt="" />
               </div>
             </div>
           </div>
@@ -199,6 +203,16 @@ export default {
   computed: {},
   components: {},
   methods: {
+    // 本地化 url 适配
+    urlToFitFu(url) {
+      const resUrl = url;
+      if (url.includes("https://super.4dage.com")) {
+        return url.replace("https://super.4dage.com", "");
+      } else if (url.includes("http://super.4dage.com")) {
+        return url.replace("http://super.4dage.com", "");
+      } else return resUrl;
+    },
+
     // 点击左右箭头
     cutMyInd(num, flag) {
       if (flag) return;
@@ -212,7 +226,11 @@ export default {
     },
     async getData() {
       // https://www.4dmodel.com/
-      let url = `https://super.4dage.com/data/${
+
+      // let url = `https://super.4dage.com/data/${   // 线上数据
+
+      let url = `/data/${
+        //本地化部署
         this.id
       }/hot/js/data.js?time=${Math.random()}`;
       let result = (await this.$http.get(url)).data;

+ 2 - 2
本地化场景/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
本地化场景/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
本地化场景/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
本地化场景/public/static/js/main_2020_show.js

@@ -14473,7 +14473,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),
@@ -17088,7 +17088,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 - 3
本地化场景/public/static/js/manage.js

@@ -1,10 +1,12 @@
   
 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("/index.html")+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 +95,7 @@ var settings = {
     hotFastTran:false,
     transparentBg: false,
     bgImg:  null,
+    localPrefix: '',
      
     tileClass:{//默认全景贴图加载的清晰度
         pc:{
@@ -671,7 +674,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
本地化场景/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("/index.html")+1);
 var s = window.location.href.split('/');
+window.isLocal = true
 s.pop();
 //var g_Prefix = s.join('/');
 var g_index=null;