Browse Source

自动跳转逻辑适配 测试环境和生产环境用一套代码 的问题

任一存 2 years ago
parent
commit
cfd8b00bcf
6 changed files with 7 additions and 10 deletions
  1. 2 1
      .env
  2. 1 2
      .env.dev
  3. 0 3
      .env.prod
  4. 1 2
      .env.test
  5. 1 1
      public/static/js/Hot.js
  6. 2 1
      src/main.js

+ 2 - 1
.env

@@ -1,2 +1,3 @@
 VUE_APP_STATIC_DIR=static
-VUE_APP_API_URL_PREFIX=https://haidebao.4dage.com
+VUE_APP_API_URL_PREFIX=
+VUE_APP_SCENE_CODE=KJ-nsyFEd392Wt

+ 1 - 2
.env.dev

@@ -1,3 +1,2 @@
 CLI_MODE=dev
-NODE_ENV=development
-VUE_APP_PC_URL=/web/index.html#/?m=KJ-nsyFEd392Wt
+NODE_ENV=development

+ 0 - 3
.env.prod

@@ -1,3 +0,0 @@
-CLI_MODE=prod
-NODE_ENV=production
-VUE_APP_PC_URL=/2023chn/index.html#/?m=KJ-nsyFEd392Wt

+ 1 - 2
.env.test

@@ -1,3 +1,2 @@
 CLI_MODE=test
-NODE_ENV=production
-VUE_APP_PC_URL=/web/index.html#/?m=KJ-nsyFEd392Wt
+NODE_ENV=production

+ 1 - 1
public/static/js/Hot.js

@@ -37,7 +37,7 @@ window.initHot = function (model) {
   var getCommonHotspotUrl = function (link) {
     var querySectionInLink = link.split('?')[1]
     var langParam = "en" == manage.number("lang") ? "&lang=" + manage.number("lang") : ""
-    // return `http://192.168.20.16:8080/#/${browser.isMobile() ? 'mobile' : 'web'}/?${querySectionInLink}&time=${randomTime().getTime()}&id=${window.number}${langParam}`
+    // return `http://192.168.20.16:8081/#/${browser.isMobile() ? 'mobile' : 'web'}/?${querySectionInLink}&time=${randomTime().getTime()}&id=${window.number}${langParam}`
     return `/webMHot/index.html#/${browser.isMobile() ? 'mobile' : 'web'}/?${querySectionInLink}&time=${randomTime().getTime()}&id=${window.number}${langParam}`
   }
   var removeSrcPostMark = function (url) {//去除texture.load时自动加上的'?'

+ 2 - 1
src/main.js

@@ -13,7 +13,8 @@ import "@/assets/style/my-reset.css"
 
 console.log('v0410.1517')
 if (!browser.mobile) {
-  location.replace(process.env.VUE_APP_PC_URL)
+  let firstUrlDir = location.href.split('/')[1]
+  location.replace(`/${firstUrlDir.substring(0, firstUrlDir.length - 1)}/index.html#?m=${process.env.VUE_APP_SCENE_CODE}`)
 }
 
 Vue.use(Viewer, {