upload0119

backstage/src/components/editcomponent/usereditdialog.vue

@@ -137,7 +137,7 @@ export default {
             this.$alert("编辑成功", "提示", {
               confirmButtonText: "确定",
               callback: () => {
-                this.$emit("logout");
+                this.$emit("close");
               },
             });
           });

backstage/src/pages/content/expert/data.js

@@ -64,7 +64,7 @@ let rules = {
     description: [
       { required: true, message: "请输入专家介绍", trigger: "blur" },
     ],
-    thumb: [{ required: true, message: "请上传专家照片", trigger: "blur" }],
+    thumb: [{ required: true, message: "请上传照片", trigger: "blur" }],
   },
 };
 

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

@@ -107,7 +107,7 @@ export default {
         'comment':'留言内容',
         'barrage':'弹幕内容',
         'questionGroup':'题组标题',
-        'donate':'捐赠信息',
+        'donate':'姓名',
       }
     };
   },

edit-backstage/js/edit.js

@@ -329,7 +329,7 @@ EditTools.prototype.initSaveAll = function() {
                 info: info, 
             } 
             console.log(data)
-            let url = cmp ? ('/api/scene/edit/' + cmp) : '/manage/scene/edit'
+            let url = cmp ? ('/api/scene/edit/' + cmp) : '/cms/scene/edit'
             $.ajax({
                 method: 'POST',
                 headers: {
@@ -342,7 +342,7 @@ EditTools.prototype.initSaveAll = function() {
                 data: JSON.stringify(data),
                 success: function(data) {
                     if (data.code === 0) {//成功
-                        //manage.showInfo("保存成功")
+                        //cms.showInfo("保存成功")
                         location.reload()
                     }else if (data.code === 5001) {
                         alert('请重新登录')
@@ -3852,7 +3852,7 @@ function uploadFile(file, type, callback, fileName) {
     //formData.append('file', file) 
     formData.append("file", file, fileName);
 
-    let url = cmp ? ('/api/scene/upload/' + number) : ('/manage/scene/upload/' + number)
+    let url = cmp ? ('/api/scene/upload/' + number) : ('/cms/scene/upload/' + number)
 
     $.ajax({
         url: ceshi + url,
@@ -5129,7 +5129,7 @@ var VisiSet = {
         alert("保存成功")
         console.log(JSON.stringify(PanoData)) */
 
-        let url = cmp ? ('/api/scene/roamViable/' + cmp) : '/manage/scene/roamViable'
+        let url = cmp ? ('/api/scene/roamViable/' + cmp) : '/cms/scene/roamViable'
 
         $.ajax({
             method: 'POST',

edit-backstage/js/manage.js

@@ -1,9 +1,9 @@
   
 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.origin+'/';
+var g_Prefix=window.location.origin+'/';
 
 var s = window.location.href.split('/');
     s.pop();

web/public/static/js/Hot.js

@@ -130,6 +130,7 @@ 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

web/public/static/js/main_2020_show.js

@@ -14504,7 +14504,7 @@ window.Modernizr = function(n, e, t) {
                 
                 window.wx && manage.weixinShare();  
                 //初始画面
-                data.camera_start && data.camera_start.thumbImg && E(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),
@@ -17122,7 +17122,14 @@ 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 = { 

web/public/static/js/manage.js

@@ -1,10 +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 s = window.location.href.split('/');
-    s.pop();
-//var g_Prefix = s.join('/');
+
+// var g_Prefix=window.location.origin+'/';
+// window.isLocal = true
+
+
 var g_index=null;
 var g_modeldata=null;
 
@@ -83,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
@@ -593,7 +595,7 @@ Manage.prototype.dealURL = function(src, type){
             return src.replace(wholeOldPrefix, settings.localPrefix)
         }
         
-        console.error("没有找到合适的本地链接") 
+        // console.error("没有找到合适的本地链接") 
         return src
     }else{
         //add https://

web/src/components/hotspot/audio.vue

@@ -330,6 +330,7 @@ export default {
       }
     }
     >ul{
+      width:100%;
       >li{
         line-height: 1.5;
         margin: 10px 0;
@@ -398,6 +399,7 @@ export default {
           left: 0;
           height: 100%;
           cursor: pointer;
+          pointer-events: none;
         }
       }
 

web/src/components/hotspot/yuange.js

@@ -4,7 +4,8 @@ const data = {
   17:'我们是光荣的白衣天使，在春风里绽放笑容',
   24:'救死扶伤的行列里，我们是排头兵',
   32:'圣洁的无影灯下走过，走过无悔的人生',
-  40:'用爱心浇灌生命之树常青，用奉献书写神圣历史使命',
+  40:'用爱心浇灌生命之树常青',
+  45:'用奉献书写神圣历史使命',
   50:'红十字星座镌刻着我们的姓名',
   58:'八一军旗上飞扬着我们的光荣',
   67:'忠诚信仰，血脉传承，追求卓越攀高峰',
@@ -13,7 +14,8 @@ const data = {
   98:'我们是光荣的白衣天使，在春风里绽放笑容',
   105:'救死扶伤的行列里，我们是排头兵',
   112:'圣洁的无影灯下走过，走过无悔的人生',
-  121:'用爱心浇灌生命之树常青，用奉献书写神圣历史使命',
+  121:'用爱心浇灌生命之树常青',
+  126:'用奉献书写神圣历史使命',
   131:'红十字星座镌刻着我们的姓名',
   139:'八一军旗上飞扬着我们的光荣',
   147:'忠诚信仰，血脉传承，追求卓越攀高峰',

web/src/views/scene/scene.vue

@@ -137,7 +137,9 @@ export default {
         // });
 
         window.player.director.on("tour.start", () => {
+          if(!window.ISMUTED){
            this.$bus.$emit("changexlzmode","Speaking1")
+          }
         });
 
          window.player.director.on("tour.end", () => {