update 1748

src/components/userInfo.vue

@@ -34,7 +34,7 @@ export default {
           logout(() => {
             localStorage.setItem("token", "");
             localStorage.setItem("userInfo", "");
-            window.location.href = "/material.html#/login";
+            window.location.href = this.$cdn ? "/material.html#/login" : '/panorama/material.html#/login' ;
           });
         },
       });

src/framework/Toolbar.vue

@@ -26,7 +26,7 @@
               ></i>
             </div>
 
-            <i v-if="item.musicInfo.music.url" class="iconfont iconmaterial_music"></i>
+            <i v-if="item.musicInfo && item.musicInfo.music.url" class="iconfont iconmaterial_music"></i>
 
             <div class="img">
               <img v-if="item.icon" :src="$cdn+item.icon+`?${Math.random()}`" alt="" />

src/framework/vr/index.vue

@@ -88,7 +88,7 @@ export default {
 
     embedpano({
       // xml: "%HTMLPATH%/static/template/tour.xml",
-      xml: `${this.$cdn}/${config.sceneNum}/vtour/tour.xml`,
+      xml: `${this.$cdn}/pano/${config.sceneNum}/vtour/tour.xml`,
       swf: "%HTMLPATH%/static/template/tour.swf",
       target: "pano",
       html5: "auto",

src/utils/request.js

@@ -57,9 +57,7 @@ export const showLoginTips = () => {
       showLoginTips.__is_show = false;
       window.localStorage.setItem('token', '')
       window.localStorage.setItem('userInfo', '')
-
-
-      location.href='/material.html#/login'
+      location.href = vue.$cdn ? "/material.html#/login" : '/panorama/material.html#/login' ;
     },
   });
 

src/views/material/pano/index.vue

@@ -93,7 +93,7 @@
             v-else-if="sub.type == 'image'"
             @click="previewImage(item)"
           >
-            <img :src=" $cdn + '/' + item.sceneCode + item.icon  + `?${Math.random()}`" alt="" />
+            <img :src=" $cdn + '/pano/' + item.sceneCode + item.icon  + `?${Math.random()}`" alt="" />
           </div>
           <!-- 文字型单元格 -->
           <span v-else>{{ data || "-" }}