Merge branch 'dev' into release

.env

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

.env.jp

@@ -12,4 +12,6 @@ VUE_APP_SERVER_URL=/
 VUE_APP_RESOURCE_URL=https://oss.4dkankan.jp/
 VUE_APP_TEST=0
 #环境区分
-VUE_APP_ENV=jp
+VUE_APP_ENV=jp
+#ico 地址
+VUE_APP_ICO=//www.4dkankan.jp/favicon.ico

.env.test

@@ -7,4 +7,6 @@ VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4-test/www/sdk/
 VUE_APP_LASER_URL=https://uat-laser.4dkankan.com/
 # 静态资源目录
 VUE_APP_STATIC_DIR=static
-VUE_APP_TEST=1
+VUE_APP_TEST=1
+#ico 地址
+VUE_APP_ICO=//4dkk.4dage.com/FDKKIMG/icon/kankan_icon.ico

.env.test-jp

@@ -12,4 +12,6 @@ VUE_APP_SERVER_URL=/
 VUE_APP_RESOURCE_URL=https://oss.4dkankan.jp/
 VUE_APP_TEST=1
 #环境区分
-VUE_APP_ENV=jp
+VUE_APP_ENV=jp
+#ico 地址
+VUE_APP_ICO=//www.4dkankan.jp/favicon.ico

public/smart-sviewer.html

@@ -4,7 +4,7 @@
         <title></title>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0" />
-        <link rel="icon" type="image/svg+xml" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon.ico" />
+        <link rel="icon" type="image/svg+xml" href="<%= VUE_APP_ICO %>" />
         <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/ext/iconfont/iconfont.css" />
         <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3693743_j4ly3fuf3y.css" />
         <script src="<%= VUE_APP_STATIC_DIR %>/ext/mobile-detect.js"></script>

src/components/header/Login.vue

@@ -69,8 +69,10 @@ const getAuth = () => {
         .catch(() => {})
 }
 const env = ref(process.env.VUE_APP_ENV)
-const forgetUrl = ref(process.env.VUE_APP_ENV == 'jp' ? '/#/welcome/index' : '/#/login/forget?from=%2F')
-const registerUrl = ref(process.env.VUE_APP_ENV == 'jp' ? '/#/welcome/index' : '/#/login/register?from=%2F')
+// const forgetUrl = ref(process.env.VUE_APP_ENV == 'jp' ? '/#/welcome/index' : '/#/login/forget?from=%2F')
+// const registerUrl = ref(process.env.VUE_APP_ENV == 'jp' ? '/#/welcome/index' : '/#/login/register?from=%2F')
+const forgetUrl = ref(process.env.VUE_APP_ENV == 'jp' ? 'https://www.4dkankan.jp/#/login' : '/#/login/forget?from=%2F')
+const registerUrl = ref(process.env.VUE_APP_ENV == 'jp' ? 'https://www.4dkankan.jp/#/login' : '/#/login/register?from=%2F')
 const checkLanguage = () => {
     localStorage.setItem('language', getLocale())
 }