From c3b4608dae8ea88e88b84b3f5b2e160e67b5be6b Mon Sep 17 00:00:00 2001
From: JinxChen <2183691628@qq.com>
Date: Mon, 19 Jun 2023 17:29:17 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=BF=83=E7=90=86=E5=BB=BA?=
 =?UTF-8?q?=E6=A8=A1=E8=BF=9B=E5=BA=A6=E6=9F=A5=E8=AF=A2=20=20=20=20=20-?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=20=E8=BF=94=E5=9B=9E=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                  | 10 ++++++++--
 src/config/models.js                       |  2 +-
 src/store/index.js                         | 11 ++++++++++-
 src/views/psychological-modeling/index.vue | 18 ++++++++++++++----
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index a3a608f..d44c3e4 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-06-14 17:21:30
+ * @LastEditTime: 2023-06-19 17:14:23
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -504,4 +504,10 @@ update
 `2023.6.17`
 feature
 - 心理建模进度查询
-    - 增加 具体返回url
\ No newline at end of file
+    - 增加 具体返回url
+
+## v1.0.63
+`2023.6.19`
+update
+- 心理建模进度查询
+    - 修改 返回逻辑
\ No newline at end of file
diff --git a/src/config/models.js b/src/config/models.js
index 525f496..10bf327 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.62F'; //版本号
+export const VERSION_MODEL = '1.0.63F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
diff --git a/src/store/index.js b/src/store/index.js
index 10c23ad..99df87e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,7 +1,7 @@
 /*
  * @Date: 2022-08-17 16:18:02
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-06-01 17:45:48
+ * @LastEditTime: 2023-06-19 11:26:22
  * @FilePath: \TelpoH5FrontendWeb\src\store\index.js
  * @description:
  */
@@ -21,6 +21,7 @@ export default new Vuex.Store({
         appId: '',
         isFromWx: null,
         ssjlToken: '',
+        fromSsjl: '',
     },
     mutations: {
         imei(state, imei) {
@@ -55,6 +56,10 @@ export default new Vuex.Store({
             state.ssjlToken = ssjlToken;
             window.localStorage[prefix + 'ssjlToken'] = ssjlToken;
         },
+        fromSsjl(state, fromSsjl) {
+            state.fromSsjl = fromSsjl;
+            window.localStorage[prefix + 'fromSsjl'] = fromSsjl;
+        },
     },
     getters: {
         imei: state => {
@@ -89,6 +94,10 @@ export default new Vuex.Store({
             if (state.ssjlToken != '') return state.ssjlToken;
             return window.localStorage[prefix + 'ssjlToken'] == null ? '' : window.localStorage[prefix + 'ssjlToken'];
         },
+        fromSsjl: state => {
+            if (state.fromSsjl != '') return state.fromSsjl;
+            return window.localStorage[prefix + 'fromSsjl'] == null ? '' : window.localStorage[prefix + 'fromSsjl'];
+        },
     },
     actions: {},
     modules: {}
diff --git a/src/views/psychological-modeling/index.vue b/src/views/psychological-modeling/index.vue
index 17ac2fd..3adbcb1 100644
--- a/src/views/psychological-modeling/index.vue
+++ b/src/views/psychological-modeling/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="page">
-         <van-nav-bar title="" :border="true" :left-arrow="true" @click-left="onNavBack"></van-nav-bar>
+         <van-nav-bar title="" :border="true" :left-arrow="true" @click-left="onNavBack" v-if="showLeftArrow"></van-nav-bar>
 		<div class="tip">
 			<div class="icon">
 				<i class="iconfont icon-tishi"></i>
@@ -75,6 +75,7 @@ export default {
 	data() {
 		return {
             info: null,
+            showLeftArrow: null,
 		}
 	},
 	mounted() {
@@ -86,8 +87,12 @@ export default {
 
 		if (params.uid) {
             this.uid = params.uid;
-            // 缓存从随后精灵传过来的token
+            // 缓存从随手精灵传过来的token
             this.$store.commit('ssjlToken', params.token);
+            // 缓存从随手精灵传过来的标识
+            this.$store.commit('fromSsjl', params.fromSsjl);
+            // 是否显示 返回标签
+            this.showLeftArrow = this.$store.getters.fromSsjl === 'true';
 			//初始化
 			this.init()
 		} else {
@@ -96,8 +101,13 @@ export default {
 	},
 	methods: {
         onNavBack() {
-            let baseUrl = process.env.NODE_ENV === "production" ? 'https://ai.ssjlai.com/parentweb' : 'https://id.ssjlai.com/parentweb';
-            window.location.href = `${baseUrl}/#/device`;
+            let fromSsjl = this.$store.getters.fromSsjl === 'true';
+            if(fromSsjl) {
+                let baseUrl = process.env.NODE_ENV === "production" ? 'https://ai.ssjlai.com/parentweb' : 'https://id.ssjlai.com/parentweb';
+                window.location.href = `${baseUrl}/#/device`;
+            } else {
+                this.$router.go(-1);
+            }
         },
 		async init() {
             let ssjlToken = this.$store.getters.ssjlToken;