update2059

backstage/src/pages/content/scene/index.vue

@@ -102,8 +102,8 @@ export default {
         this.list = res.data;
       });
     },
-    openLink(){
-      this.$alert('场景链接还没生成')
+    openLink(item){
+      window.open(`/edit-backstage/edit.html?m=${item.sceneCode}`, "_blank");
     },
     delScene(data){
       this.confirm("删除后，信息将无法恢复，是否继续？", () => {

edit-backstage/css/main.css

@@ -856,7 +856,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;
@@ -865,7 +865,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;
@@ -3738,7 +3738,7 @@ a.hasHover:hover, a:active {
 .gui-floor-icon {
     width: 32px;
     height: 29px;
-    background: url("https://super.4dage.com/images/floor-icon.png") left top no-repeat;
+    background: url("../images/floor-icon.png") left top no-repeat;
     background-size: 98%;
 }
 
@@ -6371,7 +6371,7 @@ a.hasHover.tag-link:hover {
     display: block;
     width: 18px;
     height: 18px;
-    background: url("https://super.4dage.com/images/4dage-logo.png")left top no-repeat;
+    background: url("../images/4dage-logo.png")left top no-repeat;
     background-size: 100%;
 }
 

edit-backstage/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;

edit-backstage/edit.html

@@ -1772,7 +1772,7 @@
         }else{
             
             if (!token) {
-                window.location.href = '/backstage/#/'
+                window.location.href = '/backstage/index.html#/'
             } 
         }
  

edit-backstage/hot_online1/js/about.29114d45.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["about"],{f820:function(t,e,n){"use strict";n.r(e);var a=function(){var t=this,e=t.$createElement;t._self._c;return t._m(0)},s=[function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"about"},[n("h1",[t._v("This is an about page")])])}],u=n("9ca4"),c={},i=Object(u["a"])(c,a,s,!1,null,null,null);e["default"]=i.exports}}]);
+//# sourceMappingURL=about.29114d45.js.map

edit-backstage/js/Hot.js

@@ -41,7 +41,7 @@ window.initHot = function(model){
           , o = "en" == manage.number("lang") ? "&lang=" + manage.number("lang") : "";
         -1 == r.indexOf("?") ? src = link + "?time=" + randomTime().getTime() + "&id=" + window.number + o : src = link + "&time=" + randomTime().getTime() + "&id=" + window.number + o 
             
-        return src 
+        return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1/','/edit-backstage/hot_online1/')
     }
     var removeSrcPostMark = function(url){//去除texture.load时自动加上的'?'
         var index = url.indexOf('?')
@@ -130,6 +130,8 @@ window.initHot = function(model){
              
             
             this.sid = info.sid;
+            info.styleImg = info.styleImg.map(item=>manage.dealURL(item))
+
             this.preDeal(info, source)// source:来源
             
             this.info = info

edit-backstage/js/edit.js

@@ -134,7 +134,7 @@ EditTools.prototype.init = function() {
     this.fpAngleOptions = new MenuOptions({
         dom: $(".toolRight .information [data-name=floorPlanAngle]  .MenuOptions"),
         uiCallBack : (o)=>{    
-            var name = o.name || o.$li.attr('index')
+            var name = o.name || (o.$li && o.$li.attr('index'))
             
             _settings.floorPlanAngle = parseFloat(name) * Math.PI/2  //设置好方向 (0是无效的，将不设置)
              
@@ -152,7 +152,7 @@ EditTools.prototype.init = function() {
             
         }, 
         callbackWhenChose:(o)=>{
-            var name = o.$li.attr('index')
+            var name = (o.$li && o.$li.attr('index'))
              
         }
     })
@@ -1115,7 +1115,7 @@ Hotpoint.prototype.init = function() {
     this.modelMenuOptions = new MenuOptions({
         dom: this.hotpointDetail.find(".MenuOptions[name=modelType]"),
         uiCallBack : (o)=>{ 
-            var name = o.name || o.$li.attr('index')
+            var name = o.name || (o.$li && o.$li.attr('index'))
                       
             if(name == "default"){ 
                 this.hotpointDetail.find('[name=boxDepthPanel]').removeClass('hide')
@@ -1132,7 +1132,7 @@ Hotpoint.prototype.init = function() {
             
         }, 
         callbackWhenChose:(o)=>{
-            var name = o.$li.attr('index')
+            var name = (o.$li && o.$li.attr('index'))
             
             if(name == "default"){ 
                 /* transformControls.unableScaleZ()
@@ -2154,7 +2154,7 @@ Hotpoint.prototype.initListSelect = function(){//热点样式图列表
     this.texTypeMenuOptions = new MenuOptions({
         dom: this.hotpointDetail.find(" li[name=style]  .MenuOptions"),
         uiCallBack : (o)=>{ 
-            var name = o.name || o.$li.attr('index')
+            var name = o.name || (o.$li && o.$li.attr('index'))
             for(let i in this.texLists){ this.texLists[i].listDom.parent().addClass("hide")} 
             this.texLists[name].listDom.parent().removeClass("hide")
             
@@ -2167,7 +2167,7 @@ Hotpoint.prototype.initListSelect = function(){//热点样式图列表
             
         },
         callbackWhenChose:(o)=>{
-            this.changeType( o.$li.attr('index'))
+            this.changeType( (o.$li && o.$li.attr('index')))
         }
     })
     
@@ -4647,7 +4647,7 @@ var initTransformCtl = function(THREE) {
     transformControls.transformMenuOptions = new MenuOptions({  
         dom:  $(".MenuOptions[name='transform'] "),
         uiCallBack : (o)=>{ 
-            var mode = o.name || o.$li.attr('index')
+            var mode = o.name || (o.$li && o.$li.attr('index'))
             transformControls.transCtlChangeMode(mode)
             var hotpointDetail = editTool.hotpoint.hotpointDetail
             hotpointDetail.find(" li[name=setPos] button[name=setSpace] ").css('display',mode == 'scale' ? 'none' : 'block') 

edit-backstage/js/main_2020_edit.js

@@ -6676,7 +6676,7 @@ function o(a, s, l) {
 
                         if (l.attr("data-index", a),
                         //Ce.highlight.visible && l.find("img").attr("src",'https://'+tmp),
-                        Ce.highlight.visible && l.find("img").attr("src", 'http://'+tmp),// xzw改 导览图片 https在某些服务器打不开
+                        Ce.highlight.visible && l.find("img").attr("src", tmp),// xzw改 导览图片 https在某些服务器打不开
                         s.name) {
                             var c = $('<div class="overlay"></div>').text(s.name);
                             l.prepend(c)
@@ -14190,7 +14190,7 @@ function o(a, s, l) {
                             s = U.getStartCameraOptions(g, g.panos);
                             //初始画面
                             window.DATA.camera_start && window.DATA.camera_start.thumbImg  && function(e) {
-                                $("<img/>").attr("src", e).on("load", function() {
+                                $("<img/>").attr("src", manage.dealURL(e)).on("load", function() {
                                     $("#gui-thumb").css("backgroundImage", "url(" + e + ")").fadeIn(500),
                                     $(this).remove()
                                     $(".shotImg.innerBtn").removeClass('blank').css("background-image", "url(" + e + ")")
@@ -16431,7 +16431,13 @@ function o(a, s, l) {
                         var s = d.convertWorkshopModeInt(n.metadata.camera_mode);
                         if (s === d.MESH) return 
                         
-                        if(window.isLocal)var src = manage.dealURL(r)
+                        if(window.isLocal){
+                            var src = manage.dealURL(r)
+                            //本地文件莫名少了个"."
+                            if(src[src.length-1]=='.'){
+                               src = src.slice(0,-1) 
+                            }
+                        }
                         else var src = "one" === g_version ? g_Prefix + r + "?" + randomTime().getTime() :  r + "?" + randomTime().getTime()
                          
                         var l = { 

edit-backstage/js/manage.js

@@ -1,13 +1,11 @@
   
 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=window.location.origin+'/';
+window.isLocal = true
+
 
-var s = window.location.href.split('/');
-    s.pop();
-//var g_Prefix = s.join('/');
 var g_index=null;
 var g_modeldata=null;
 
@@ -33,7 +31,7 @@ var g_TextColor=0x7777ff;
 var g_Text=null;
 var g_TextPlaneMesh=[];
 var g_TextIconMesh=[];
-var g_TextIcon="./images/text.png";
+var g_TextIcon="./static/images/text.png";
 var g_SelectTextIndex=null;
 var g_TextShow=null;
 var g_audioPlay=false;
@@ -86,7 +84,8 @@ var settings = {
     tourRotTime:2,  //默认停留2秒
     //dontExamHot:true  
     transparentBg: false,
-    bgImg:  null 
+    bgImg:  null,
+    localPrefix:'/'
 }
 if(window.number == '725'||window.number == '724'){
     settings.mobileNavHigh = true
@@ -359,7 +358,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){
@@ -596,7 +595,7 @@ Manage.prototype.dealURL = function(src, type){
             return src.replace(wholeOldPrefix, settings.localPrefix)
         }
         
-        console.error("没有找到合适的本地链接") 
+        // console.error("没有找到合适的本地链接") 
         return src
     }else{
         //add https://
@@ -998,10 +997,15 @@ var SoundManager = {//暂不支持同时播放
                 object.audio.currentTime = currentTime
             }
             if(object.audio){
+
+                console.log(window.ISMUTED,1111111);
+                object.audio.muted = window.ISMUTED
                 object.audio.load();	// iOS 9   还需要额外的 load 一下, 否则直接 play 无效 *///https://www.cnblogs.com/interdrp/p/4211883.html   部分资料
                 object.audio.play();
                 object.callback && object.callback(true)
             }
+
+            console.log(this.currentAudio);
             Log(name + '  播放 '  )
         }
         
@@ -1056,6 +1060,7 @@ var SoundManager = {//暂不支持同时播放
         if(!object.fake){
             object.audio = new Audio(); 
             object.audio.loop = !!object.loop;
+
             //object.audio.autoplay = true;
         
             
@@ -1090,14 +1095,14 @@ var SoundManager = {//暂不支持同时播放
             }
             document.removeEventListener("touchstart",play);
             document.removeEventListener("click",play);
-            $('#player')[0].removeEventListener("touchstart", play);
+            $('#player')[0] && $('#player')[0].removeEventListener("touchstart", play);
         }.bind(this);
         
         
         document.addEventListener("WeixinJSBridgeReady", play, false);
         document.addEventListener("touchstart", play);//ios需要加个事件才能播放 不能自动播放；如果还有浏览器不行，换成别的交互事件
         document.addEventListener("click", play);
-        $('#player')[0].addEventListener("touchstart", play); 
+        $('#player')[0] && $('#player')[0].addEventListener("touchstart", play); 
             
          
     }
@@ -1133,10 +1138,10 @@ Manage.prototype.loadAudio = function() { //相关：g_tourAudio \  g_playAudio
         },
         callback:(state)=>{//play或pause时随之触发的函数（即使还没开始播放）
             if(state){
-                $("#volume a img").attr("src", "./images/Volume btn_off.png")
+                $("#volume a img").attr("src", "./static/images/Volume btn_off.png")
                 $("#volume").attr("title", "关闭声音");
             }else{
-                $("#volume a img").attr("src", "./images/Volume btn_on.png")
+                $("#volume a img").attr("src", "./static/images/Volume btn_on.png")
                 $("#volume").attr("title", "打开声音");
             }
         }