jinx 9 månader sedan
förälder
incheckning
e8412eb806
5 ändrade filer med 6 tillägg och 3 borttagningar
  1. 1 0
      .env
  2. 1 0
      .env.jp
  3. 1 0
      .env.test-jp
  4. 1 1
      src/pages/SViewer.vue
  5. 2 2
      src/pages/Viewer.vue

+ 1 - 0
.env

@@ -9,6 +9,7 @@ VUE_APP_STATIC_DIR=static
 # 场景资源地址
 VUE_APP_SERVER_URL=/
 VUE_APP_RESOURCE_URL=https://4dkk.4dage.com/
+VUE_APP_LASER_RESOURCE_URL=https://laser-oss.4dkankan.com/
 VUE_APP_TEST=0
 #ico 地址
 VUE_APP_ICO=//4dkk.4dage.com/FDKKIMG/icon/kankan_icon.ico

+ 1 - 0
.env.jp

@@ -10,6 +10,7 @@ VUE_APP_STATIC_DIR=static
 # 场景资源地址
 VUE_APP_SERVER_URL=/
 VUE_APP_RESOURCE_URL=https://oss.4dkankan.jp/
+VUE_APP_LASER_RESOURCE_URL=https://oss.4dkankan.jp/
 VUE_APP_TEST=0
 #环境区分
 VUE_APP_ENV=jp

+ 1 - 0
.env.test-jp

@@ -10,6 +10,7 @@ VUE_APP_STATIC_DIR=static
 # 场景资源地址
 VUE_APP_SERVER_URL=/
 VUE_APP_RESOURCE_URL=https://oss.4dkankan.jp/
+VUE_APP_LASER_RESOURCE_URL=https://oss.4dkankan.jp/
 VUE_APP_TEST=1
 #环境区分
 VUE_APP_ENV=jp

+ 1 - 1
src/pages/SViewer.vue

@@ -94,7 +94,7 @@ const sourceURL = computed(() => {
     if (source.value.type < 2) {
         return `smart-kankan.html?m=${source.value.num}`
     } else {
-        return `smart-laser.html?m=${source.value.num}${isDev ? '&dev' : ''}&serve_link=${process.env.VUE_APP_LASER_URL}&resourceBasePath=${process.env.VUE_APP_RESOURCE_URL}`
+        return `smart-laser.html?m=${source.value.num}${isDev ? '&dev' : ''}&serve_link=${process.env.VUE_APP_LASER_URL}&resourceBasePath=${process.env.VUE_APP_RESOURCE_URL}&cloudResourceBasePath=${process.env.VUE_APP_LASER_RESOURCE_URL}`
     }
 })
 

+ 2 - 2
src/pages/Viewer.vue

@@ -230,7 +230,7 @@ const sourceURL = computed(() => {
     } else {
         getLaserInfo(source.value.num)
         // 深时场景
-        return `smart-laser.html?m=${source.value.num}${isDev ? '&dev' : ''}&lang=${getLocale()}&serve_link=${process.env.VUE_APP_LASER_URL}&resourceBasePath=${process.env.VUE_APP_RESOURCE_URL}`
+        return `smart-laser.html?m=${source.value.num}${isDev ? '&dev' : ''}&lang=${getLocale()}&serve_link=${process.env.VUE_APP_LASER_URL}&resourceBasePath=${process.env.VUE_APP_RESOURCE_URL}&cloudResourceBasePath=${process.env.VUE_APP_LASER_RESOURCE_URL}`
     }
 })
 const noPanorama = ref(true)
@@ -266,7 +266,7 @@ const targetURL = computed(() => {
         return `smart-kankan.html?m=${target.value.num}${isDev ? '&dev' : ''}&lang=${getLocale()}&serve_link=${process.env.VUE_APP_LASER_URL}`
     } else {
         // 深时场景
-        return `smart-laser.html?m=${target.value.num}${isDev ? '&dev' : ''}&lang=${getLocale()}&serve_link=${process.env.VUE_APP_LASER_URL}&resourceBasePath=${process.env.VUE_APP_RESOURCE_URL}`
+        return `smart-laser.html?m=${target.value.num}${isDev ? '&dev' : ''}&lang=${getLocale()}&serve_link=${process.env.VUE_APP_LASER_URL}&resourceBasePath=${process.env.VUE_APP_RESOURCE_URL}&cloudResourceBasePath=${process.env.VUE_APP_LASER_RESOURCE_URL}`
     }
 })
 const sourceDate = computed(() => {