From f2779b490462d330d81580410239ac93f767e999 Mon Sep 17 00:00:00 2001
From: wzl <1720360649@qq.com>
Date: Wed, 7 Aug 2024 10:21:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8F=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E5=8A=A0=E4=B8=8A=E5=8F=AF=E9=80=89=E5=A4=B4=E9=83=A8?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                | 10 ++++++-
 src/config/models.js                     |  2 +-
 src/views/psychological-scale/detail.vue |  3 +-
 src/views/psychological-scale/index.vue  | 35 ++++++++++++++++++++++--
 src/views/psychological-scale/list.vue   |  4 ++-
 5 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 0a725a0..1be5057 100644
--- a/README.md
+++ b/README.md
@@ -1180,4 +1180,12 @@ update
 
 `2024.8.7`
 update
-- 更新
+
+- 增加 心理量表功能
+
+## v1.0.129
+
+`2024.8.8`
+update
+
+- 量表页面全部增加可选头部导航
diff --git a/src/config/models.js b/src/config/models.js
index 246ad65..bb956c5 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -8,7 +8,7 @@
 import store from "@/store";
 // 情绪模型
 const appTypeList = ['1'];
-export const VERSION_MODEL = '1.0.128F'; //版本号
+export const VERSION_MODEL = '1.0.129F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
diff --git a/src/views/psychological-scale/detail.vue b/src/views/psychological-scale/detail.vue
index 926f83a..fbbf2d8 100644
--- a/src/views/psychological-scale/detail.vue
+++ b/src/views/psychological-scale/detail.vue
@@ -1,11 +1,12 @@
 <template>
-	<div class="page">
+	<div class="page" :style="`padding-top: ${showLeftArrow ? '46px' : '0'};`">
 		<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" />返回
diff --git a/src/views/psychological-scale/index.vue b/src/views/psychological-scale/index.vue
index 2fa9217..5165676 100644
--- a/src/views/psychological-scale/index.vue
+++ b/src/views/psychological-scale/index.vue
@@ -1,6 +1,22 @@
 <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="progress">
 					<van-progress
@@ -128,7 +144,9 @@ export default {
 			// 缓存从随手精灵传过来的标识
 			this.$store.commit('fromSsjl', params.fromSsjl)
 			// 是否显示 返回标签
-			this.showLeftArrow = this.$store.getters.fromSsjl === 'true'
+			if (params.showLeftArrow) {
+				this.showLeftArrow = true
+			}
 			this.fromUrl = params.fromUrl
 			console.log('fromUrl', this.fromUrl)
 
@@ -274,6 +292,17 @@ export default {
 				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
 		getAuth() {
 			let manufactorId = '5bf13062-a41e-4d00-ba14-1101aad12650'
diff --git a/src/views/psychological-scale/list.vue b/src/views/psychological-scale/list.vue
index b009c00..800aba9 100644
--- a/src/views/psychological-scale/list.vue
+++ b/src/views/psychological-scale/list.vue
@@ -1,11 +1,13 @@
 <template>
-	<div class="page">
+	<div class="page"
+  :style="`padding-top: ${showLeftArrow ? '46px' : '0'};`">
 		<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" />返回