Merge branch 'feat' into test

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-08-21 10:29:15
+ * @LastEditTime: 2023-09-16 09:24:37
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -679,4 +679,10 @@ update
 ## v1.0.84
 `2023.8.21`
 update
-- 增加 区分心里健康接口正式环境和测试环境
+- 增加 区分心里健康接口正式环境和测试环境
+
+
+## v1.0.85
+`2023.9.16`
+update
+- 修改 返回随手精灵的地址

src/config/models.js

@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.84F'; //版本号
+export const VERSION_MODEL = '1.0.85F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/views/health/psychological-main/index.vue

@@ -145,7 +145,7 @@ export default {
     },
     onNavBack() {
         if(this.isShowLeft) {
-            window.location.href = `${this.$route.query.fromUrl}/#/device`;
+            window.location.href = `${this.$route.query.fromUrl}/#/${ this.$route.query.fromMenu || 'device'}`;
         } else {
             this.$router.go(-1);
         }

src/views/psychological-modeling/index.vue

@@ -151,7 +151,7 @@ export default {
             let fromSsjl = this.$store.getters.fromSsjl === 'true';
             if(fromSsjl) {
                 let baseUrl = this.fromUrl;
-                window.location.href = `${baseUrl}/#/device`;
+                window.location.href = `${baseUrl}/#/${ this.$route.query.fromMenu || 'device'}`;
             } else {
                 this.$router.go(-1);
             }