Merge branch 'dev' of http://192.168.0.115:3000/4dkankan/4dkankan_bim into dev

.env.eur

@@ -0,0 +1,18 @@
+NODE_ENV=production
+# 静态资源地址
+VUE_APP_CDN_URL=https://testeurs3.4dkankan.com/v4/www/
+# sdk文件地址
+VUE_APP_SDK_DIR=https://testeurs3.4dkankan.com/v4/www/sdk/
+# 激光接口地址
+VUE_APP_LASER_URL=https://mega.4dkankan.jp/backend/
+# 静态资源目录
+VUE_APP_STATIC_DIR=static
+# 场景资源地址
+VUE_APP_SERVER_URL=/
+VUE_APP_RESOURCE_URL=https://testeurs3.4dkankan.com/
+VUE_APP_LASER_RESOURCE_URL=https://testeurs3.4dkankan.com/
+VUE_APP_TEST=0
+#环境区分
+VUE_APP_ENV=aws
+#ico 地址
+VUE_APP_ICO=//testeurs3.4dkankan.com/v4/www/editor/favicon.ico

.env.test-eur

@@ -0,0 +1,24 @@
+NODE_ENV=production
+# 静态资源地址
+VUE_APP_CDN_URL=https://testeurs3.4dkankan.com/v4/www/
+# sdk文件地址
+VUE_APP_SDK_DIR=https://testeurs3.4dkankan.com/v4/www/sdk/
+# 激光接口地址
+VUE_APP_LASER_URL=https://test-eurlaser.4dkankan.com/
+# 静态资源目录
+VUE_APP_STATIC_DIR=static
+# 场景资源地址
+VUE_APP_SERVER_URL=/
+VUE_APP_RESOURCE_URL=https://testeurs3.4dkankan.com/
+VUE_APP_LASER_RESOURCE_URL=https://testeurs3.4dkankan.com/
+VUE_APP_TEST=0
+#环境区分
+VUE_APP_ENV=aws
+#ico 地址
+VUE_APP_ICO=//testeurs3.4dkankan.com/v4/www/editor/favicon.ico
+
+
+
+
+
+

package.json

@@ -8,6 +8,8 @@
     "build:jp": "vue-cli-service build --mode jp",
     "build:test": "vue-cli-service build --mode test",
     "build:test-jp": "vue-cli-service build --mode test-jp",
+    "build:eur": "vue-cli-service build --mode eur",
+    "build:test-eur": "vue-cli-service build --mode test-eur",
     "langs": "node ./scripts/update-i18n.js"
   },
   "dependencies": {

src/components/header/Login.vue

@@ -82,7 +82,7 @@ const onLogin = () => {
         errors.value.username = process.env.VUE_APP_ENV == 'jp' ? t('header.phoneTexten') : t('header.phoneText1')
         return
     }
-    if (process.env.VUE_APP_ENV == 'jp') {
+    if (process.env.VUE_APP_ENV == 'jp' || process.env.VUE_APP_ENV == 'aws') {
         if (!/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$/.test(username.value)) {
             errors.value.username = t('header.phoneText3')
             return

src/locales/en.json

@@ -130,7 +130,8 @@
     "4003": "The user does not exist",
     "3014": "The account number or password is incorrect.",
     "3015": "The user does not exist",
-    "4013": "The current scene is not detected under this account, please change your account and log in again."
+    "4013": "The current scene is not detected under this account, please change your account and log in again.",
+    "4014": "Your current account is not authenticated, please authenticate it before logging in."
   },
   "code.name": "code"
 }

src/locales/ja.json

@@ -130,7 +130,8 @@
     "4003": "ユーザーが存在しません",
     "3014": "アカウント番号またはパスワードが正しくありません",
     "3015": "ユーザーが存在しません",
-    "4013": "このアカウントで現在のシーンが検出されません。アカウントを変更して再度ログインしてください。"
+    "4013": "このアカウントで現在のシーンが検出されません。アカウントを変更して再度ログインしてください。",
+    "4014": "現在のアカウントは認証されていませんので、認証してからログインしてください。"
   },
   "code.name": "状態コード"
 }

src/locales/zh.json

@@ -130,7 +130,8 @@
     "4003": "用户不存在",
     "3014": "账号或密码不正确。",
     "3015": "用户不存在。",
-    "4013": "该账号下未检测到当前场景，请更换账号重新登录"
+    "4013": "该账号下未检测到当前场景，请更换账号重新登录",
+    "4014": "当前登录账号未授权，请先授权后再登录"
   },
   "code.name": "状态码"
 }

src/pages/SViewer.vue

@@ -94,7 +94,17 @@ 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}&panoResourceBasePath=${process.env.VUE_APP_RESOURCE_URL}&resourceBasePath  =${process.env.VUE_APP_LASER_RESOURCE_URL}`
+        let url = ''
+        if (process.env.VUE_APP_ENV == 'aws') {
+            url = `smart-laser.html?m=${source.value.num}${isDev ? '&dev' : ''}&serve_link=${process.env.VUE_APP_LASER_URL}&panoResourceBasePath=${process.env.VUE_APP_RESOURCE_URL}&resourceBasePath=${
+                process.env.VUE_APP_LASER_RESOURCE_URL
+            }&region=${process.env.VUE_APP_ENV}`
+        } else {
+            url = `smart-laser.html?m=${source.value.num}${isDev ? '&dev' : ''}&serve_link=${process.env.VUE_APP_LASER_URL}&panoResourceBasePath=${process.env.VUE_APP_RESOURCE_URL}&resourceBasePath=${
+                process.env.VUE_APP_LASER_RESOURCE_URL
+            }`
+        }
+        return url
     }
 })
 

src/pages/Viewer.vue

@@ -230,9 +230,18 @@ 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}&panoResourceBasePath=${
-            process.env.VUE_APP_RESOURCE_URL
-        }&resourceBasePath=${process.env.VUE_APP_LASER_RESOURCE_URL}`
+
+        let url = ''
+        if (process.env.VUE_APP_ENV == 'aws') {
+            url = `smart-laser.html?m=${source.value.num}${isDev ? '&dev' : ''}&lang=${getLocale()}&serve_link=${process.env.VUE_APP_LASER_URL}&panoResourceBasePath=${
+                process.env.VUE_APP_RESOURCE_URL
+            }&resourceBasePath=${process.env.VUE_APP_LASER_RESOURCE_URL}&region=${process.env.VUE_APP_ENV}`
+        } else {
+            url = `smart-laser.html?m=${source.value.num}${isDev ? '&dev' : ''}&lang=${getLocale()}&serve_link=${process.env.VUE_APP_LASER_URL}&panoResourceBasePath=${
+                process.env.VUE_APP_RESOURCE_URL
+            }&resourceBasePath=${process.env.VUE_APP_LASER_RESOURCE_URL}`
+        }
+        return url
     }
 })
 const noPanorama = ref(true)
@@ -268,9 +277,17 @@ 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}&panoResourceBasePath=${
-            process.env.VUE_APP_RESOURCE_URL
-        }&resourceBasePath=${process.env.VUE_APP_LASER_RESOURCE_URL}`
+        let url = ''
+        if (process.env.VUE_APP_ENV == 'aws') {
+            url = `smart-laser.html?m=${target.value.num}${isDev ? '&dev' : ''}&lang=${getLocale()}&serve_link=${process.env.VUE_APP_LASER_URL}&panoResourceBasePath=${
+                process.env.VUE_APP_RESOURCE_URL
+            }&resourceBasePath=${process.env.VUE_APP_LASER_RESOURCE_URL}&region=${process.env.VUE_APP_ENV}`
+        } else {
+            url = `smart-laser.html?m=${target.value.num}${isDev ? '&dev' : ''}&lang=${getLocale()}&serve_link=${process.env.VUE_APP_LASER_URL}&panoResourceBasePath=${
+                process.env.VUE_APP_RESOURCE_URL
+            }&resourceBasePath=${process.env.VUE_APP_LASER_RESOURCE_URL}`
+        }
+        return url
     }
 })
 const sourceDate = computed(() => {

src/pages/kankan.js

@@ -14,6 +14,7 @@ loadLocaleMessages(i18n, local).then(() => {
     }
     const server = browser.valueFromUrl('app_server') || process.env.VUE_APP_SERVER_URL || ''
     const resource = browser.valueFromUrl('app_resource') || process.env.VUE_APP_RESOURCE_URL || ''
+
     window.app = new KanKan({
         dom: '#app',
         num: browser.valueFromUrl('m'),
@@ -27,7 +28,8 @@ loadLocaleMessages(i18n, local).then(() => {
             ja: lan,
         },
         server,
-        resource
+        resource,
+        region: process.env.VUE_APP_ENV,
     })
 
     app.use('TagEditor')