@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Date: 2022-08-17 16:19:13 | * @Date: 2022-08-17 16:19:13 | ||||
* @LastEditors: JinxChen | * @LastEditors: JinxChen | ||||
* @LastEditTime: 2023-06-14 17:21:30 | |||||
* @LastEditTime: 2023-06-19 17:14:23 | |||||
* @FilePath: \TelpoH5FrontendWeb\README.md | * @FilePath: \TelpoH5FrontendWeb\README.md | ||||
* @description: 项目说明 | * @description: 项目说明 | ||||
--> | --> | ||||
@@ -504,4 +504,10 @@ update | |||||
`2023.6.17` | `2023.6.17` | ||||
feature | feature | ||||
- 心理建模进度查询 | - 心理建模进度查询 | ||||
- 增加 具体返回url | |||||
- 增加 具体返回url | |||||
## v1.0.63 | |||||
`2023.6.19` | |||||
update | |||||
- 心理建模进度查询 | |||||
- 修改 返回逻辑 |
@@ -5,7 +5,7 @@ | |||||
* @FilePath: \TelpoH5FrontendWeb\src\config\models.js | * @FilePath: \TelpoH5FrontendWeb\src\config\models.js | ||||
* @description: | * @description: | ||||
*/ | */ | ||||
export const VERSION_MODEL = '1.0.62F'; //版本号 | |||||
export const VERSION_MODEL = '1.0.63F'; //版本号 | |||||
export const IMAGE_URL = { | export const IMAGE_URL = { | ||||
production: 'http://zfb.ssjlai.com/web/', | production: 'http://zfb.ssjlai.com/web/', | ||||
test: 'http://zfb.ssjlai.com/web/', | test: 'http://zfb.ssjlai.com/web/', | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* @Date: 2022-08-17 16:18:02 | * @Date: 2022-08-17 16:18:02 | ||||
* @LastEditors: JinxChen | * @LastEditors: JinxChen | ||||
* @LastEditTime: 2023-06-01 17:45:48 | |||||
* @LastEditTime: 2023-06-19 11:26:22 | |||||
* @FilePath: \TelpoH5FrontendWeb\src\store\index.js | * @FilePath: \TelpoH5FrontendWeb\src\store\index.js | ||||
* @description: | * @description: | ||||
*/ | */ | ||||
@@ -21,6 +21,7 @@ export default new Vuex.Store({ | |||||
appId: '', | appId: '', | ||||
isFromWx: null, | isFromWx: null, | ||||
ssjlToken: '', | ssjlToken: '', | ||||
fromSsjl: '', | |||||
}, | }, | ||||
mutations: { | mutations: { | ||||
imei(state, imei) { | imei(state, imei) { | ||||
@@ -55,6 +56,10 @@ export default new Vuex.Store({ | |||||
state.ssjlToken = ssjlToken; | state.ssjlToken = ssjlToken; | ||||
window.localStorage[prefix + 'ssjlToken'] = ssjlToken; | window.localStorage[prefix + 'ssjlToken'] = ssjlToken; | ||||
}, | }, | ||||
fromSsjl(state, fromSsjl) { | |||||
state.fromSsjl = fromSsjl; | |||||
window.localStorage[prefix + 'fromSsjl'] = fromSsjl; | |||||
}, | |||||
}, | }, | ||||
getters: { | getters: { | ||||
imei: state => { | imei: state => { | ||||
@@ -89,6 +94,10 @@ export default new Vuex.Store({ | |||||
if (state.ssjlToken != '') return state.ssjlToken; | if (state.ssjlToken != '') return state.ssjlToken; | ||||
return window.localStorage[prefix + 'ssjlToken'] == null ? '' : window.localStorage[prefix + '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: {}, | actions: {}, | ||||
modules: {} | modules: {} |
@@ -1,6 +1,6 @@ | |||||
<template> | <template> | ||||
<div class="page"> | <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="tip"> | ||||
<div class="icon"> | <div class="icon"> | ||||
<i class="iconfont icon-tishi"></i> | <i class="iconfont icon-tishi"></i> | ||||
@@ -75,6 +75,7 @@ export default { | |||||
data() { | data() { | ||||
return { | return { | ||||
info: null, | info: null, | ||||
showLeftArrow: null, | |||||
} | } | ||||
}, | }, | ||||
mounted() { | mounted() { | ||||
@@ -86,8 +87,12 @@ export default { | |||||
if (params.uid) { | if (params.uid) { | ||||
this.uid = params.uid; | this.uid = params.uid; | ||||
// 缓存从随后精灵传过来的token | |||||
// 缓存从随手精灵传过来的token | |||||
this.$store.commit('ssjlToken', params.token); | this.$store.commit('ssjlToken', params.token); | ||||
// 缓存从随手精灵传过来的标识 | |||||
this.$store.commit('fromSsjl', params.fromSsjl); | |||||
// 是否显示 返回标签 | |||||
this.showLeftArrow = this.$store.getters.fromSsjl === 'true'; | |||||
//初始化 | //初始化 | ||||
this.init() | this.init() | ||||
} else { | } else { | ||||
@@ -96,8 +101,13 @@ export default { | |||||
}, | }, | ||||
methods: { | methods: { | ||||
onNavBack() { | 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() { | async init() { | ||||
let ssjlToken = this.$store.getters.ssjlToken; | let ssjlToken = this.$store.getters.ssjlToken; | ||||