@@ -1180,4 +1180,12 @@ update | |||||
`2024.8.7` | `2024.8.7` | ||||
update | update | ||||
- 更新 | |||||
- 增加 心理量表功能 | |||||
## v1.0.129 | |||||
`2024.8.8` | |||||
update | |||||
- 量表页面全部增加可选头部导航 |
@@ -8,7 +8,7 @@ | |||||
import store from "@/store"; | import store from "@/store"; | ||||
// 情绪模型 | // 情绪模型 | ||||
const appTypeList = ['1']; | const appTypeList = ['1']; | ||||
export const VERSION_MODEL = '1.0.128F'; //版本号 | |||||
export const VERSION_MODEL = '1.0.129F'; //版本号 | |||||
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,11 +1,12 @@ | |||||
<template> | <template> | ||||
<div class="page"> | |||||
<div class="page" :style="`padding-top: ${showLeftArrow ? '46px' : '0'};`"> | |||||
<van-nav-bar | <van-nav-bar | ||||
title="测评结果" | title="测评结果" | ||||
:border="true" | :border="true" | ||||
:left-arrow="true" | :left-arrow="true" | ||||
@click-left="onNavBack" | @click-left="onNavBack" | ||||
v-if="showLeftArrow" | v-if="showLeftArrow" | ||||
style="position: fixed; left: 0; top: 0;width: 100vw;" | |||||
> | > | ||||
<template #left> | <template #left> | ||||
<van-icon name="arrow-left" size="23" style="padding: 0" />返回 | <van-icon name="arrow-left" size="23" style="padding: 0" />返回 | ||||
@@ -1,6 +1,22 @@ | |||||
<template> | <template> | ||||
<div class="page" v-if="topic.length"> | |||||
<div class="top"> | |||||
<div | |||||
class="page" | |||||
v-if="topic.length" | |||||
:style="`padding-top: ${showLeftArrow ? 'calc(24vw + 46px)' : '24vw'};`" | |||||
> | |||||
<van-nav-bar | |||||
title="测评" | |||||
:border="true" | |||||
:left-arrow="true" | |||||
@click-left="onNavBack" | |||||
v-if="showLeftArrow" | |||||
style="position: fixed; left: 0; top: 0;width: 100vw;" | |||||
> | |||||
<template #left> | |||||
<van-icon name="arrow-left" size="23" style="padding: 0" />返回 | |||||
</template> | |||||
</van-nav-bar> | |||||
<div class="top" :style="`top: ${showLeftArrow ? '46px' : '0'};`"> | |||||
<div class="schedule"> | <div class="schedule"> | ||||
<div class="progress"> | <div class="progress"> | ||||
<van-progress | <van-progress | ||||
@@ -128,7 +144,9 @@ export default { | |||||
// 缓存从随手精灵传过来的标识 | // 缓存从随手精灵传过来的标识 | ||||
this.$store.commit('fromSsjl', params.fromSsjl) | this.$store.commit('fromSsjl', params.fromSsjl) | ||||
// 是否显示 返回标签 | // 是否显示 返回标签 | ||||
this.showLeftArrow = this.$store.getters.fromSsjl === 'true' | |||||
if (params.showLeftArrow) { | |||||
this.showLeftArrow = true | |||||
} | |||||
this.fromUrl = params.fromUrl | this.fromUrl = params.fromUrl | ||||
console.log('fromUrl', this.fromUrl) | console.log('fromUrl', this.fromUrl) | ||||
@@ -274,6 +292,17 @@ export default { | |||||
console.log(error) | console.log(error) | ||||
} | } | ||||
}, | }, | ||||
onNavBack() { | |||||
let fromSsjl = this.$store.getters.fromSsjl === 'true' | |||||
if (fromSsjl) { | |||||
let baseUrl = this.fromUrl | |||||
window.location.href = `${baseUrl}/#/${ | |||||
this.$route.query.fromMenu || 'device' | |||||
}` | |||||
} else { | |||||
window.history.go(-1) | |||||
} | |||||
}, | |||||
// 获取b端token | // 获取b端token | ||||
getAuth() { | getAuth() { | ||||
let manufactorId = '5bf13062-a41e-4d00-ba14-1101aad12650' | let manufactorId = '5bf13062-a41e-4d00-ba14-1101aad12650' | ||||
@@ -1,11 +1,13 @@ | |||||
<template> | <template> | ||||
<div class="page"> | |||||
<div class="page" | |||||
:style="`padding-top: ${showLeftArrow ? '46px' : '0'};`"> | |||||
<van-nav-bar | <van-nav-bar | ||||
title="我的测评" | title="我的测评" | ||||
:border="true" | :border="true" | ||||
:left-arrow="true" | :left-arrow="true" | ||||
@click-left="onNavBack" | @click-left="onNavBack" | ||||
v-if="showLeftArrow" | v-if="showLeftArrow" | ||||
style="position: fixed; left: 0; top: 0;width: 100vw;" | |||||
> | > | ||||
<template #left> | <template #left> | ||||
<van-icon name="arrow-left" size="23" style="padding: 0" />返回 | <van-icon name="arrow-left" size="23" style="padding: 0" />返回 | ||||