From decbcf1337ad56d1bd0ecfe14433c60b4339d6a3 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Mon, 20 Dec 2021 16:43:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 src/pages.json                                |  2 +-
 .../project/components/Title/Title.vue        |  4 +-
 src/pagesYanyuan/assess/assess.vue            |  6 ++-
 .../assess/components/Title/Title.vue         | 46 +++++++++++++++++++
 5 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 src/pagesYanyuan/assess/components/Title/Title.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf98041..f1338ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -199,6 +199,7 @@
  - | 绘制canvas | [3c9d471](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/3c9d471)
  - | 绘图背景图显示及路径绘制 | [964e41e](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/964e41e)
  - | 缓存基本信息 | [d160dad](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/d160dad)
+ - | 药物使用记录修改 | [d8eb422](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/d8eb422)
  - | 角色显示状态修改 | [7d3b906](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/7d3b906)
  - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/19228d6)
  - | 解决error | [00d96c4](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/00d96c4)
diff --git a/src/pages.json b/src/pages.json
index 0bf296d..fc7da06 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -69,7 +69,7 @@
 						"path": "assess/assess",
 						"style": {
 							"navigationBarTitleText": "脑力测评",
-							"navigationStyle": "default"
+							"navigationStyle": "custom"
 						}
 					},
 					{
diff --git a/src/pagesProject/project/components/Title/Title.vue b/src/pagesProject/project/components/Title/Title.vue
index f7c637e..957f788 100644
--- a/src/pagesProject/project/components/Title/Title.vue
+++ b/src/pagesProject/project/components/Title/Title.vue
@@ -3,7 +3,7 @@
     <!-- #ifdef MP-WEIXIN -->
     <!-- :is-back="false" -->
     <u-navbar :custom-back="onBack" class="overflow-hidden">
-      <view class="flex justify-start flex-1 px-3 font-bold min-0">
+      <view class="flex justify-start flex-1 px-3 min-0 text-base">
         <view class="truncate">{{ project.name }}</view>
       </view>
     </u-navbar>
@@ -11,7 +11,7 @@
     <!-- h5标题 -->
     <!-- #ifdef H5 -->
     <view class="overflow-hidden py-3">
-      <view class="flex justify-start flex-1 px-3 font-bold min-0">
+      <view class="flex justify-start flex-1 px-3 min-0 text-base">
         <u-icon name="arrow-left" @click="onBack" class="mr-3" size="40" />
         <view class="truncate">{{ project.name }}</view>
       </view>
diff --git a/src/pagesYanyuan/assess/assess.vue b/src/pagesYanyuan/assess/assess.vue
index e552a0d..cf0e1ae 100644
--- a/src/pagesYanyuan/assess/assess.vue
+++ b/src/pagesYanyuan/assess/assess.vue
@@ -1,5 +1,8 @@
 <template>
   <view class="flex flex-col p-3">
+    <!-- 标题栏 -->
+    <Title />
+
     <!-- 全局提示框 -->
     <u-top-tips ref="uTips"></u-top-tips>
 
@@ -20,9 +23,10 @@
 import { mapState, mapGetters, mapMutations, mapActions } from 'vuex';
 import promptPage from './components/Test/promptPage';
 import answerPage from './components/Test/answerPage';
+import Title from './components/Title/Title';
 
 export default {
-  components: { promptPage, answerPage },
+  components: { promptPage, answerPage, Title },
 
   data() {
     return { showAnswerPage: false, param: {} };
diff --git a/src/pagesYanyuan/assess/components/Title/Title.vue b/src/pagesYanyuan/assess/components/Title/Title.vue
new file mode 100644
index 0000000..d7fe182
--- /dev/null
+++ b/src/pagesYanyuan/assess/components/Title/Title.vue
@@ -0,0 +1,46 @@
+<template>
+  <view>
+    <!-- #ifdef MP-WEIXIN -->
+    <!-- :is-back="false" -->
+    <u-navbar :custom-back="onBack" class="overflow-hidden">
+      <view class="flex justify-start flex-1 px-3 min-0 text-base">
+        <view class="truncate" v-if="code === 'NLCP'">脑力测评</view>
+        <view class="truncate" v-if="code === 'ZARIT'">Zarit照顾者负担量表</view>
+      </view>
+    </u-navbar>
+    <!-- #endif -->
+    <!-- h5标题 -->
+    <!-- #ifdef H5 -->
+    <view class="overflow-hidden py-3">
+      <view class="flex justify-start flex-1 px-3 min-0 text-base">
+        <u-icon name="arrow-left" @click="onBack" class="mr-3" size="40" />
+        <view class="truncate" v-if="code === 'NLCP'">脑力测评</view>
+        <view class="truncate" v-if="code === 'ZARIT'">Zarit照顾者负担量表</view>
+      </view>
+    </view>
+    <!-- #endif -->
+  </view>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+
+export default {
+  name: 'AssessTitle',
+  data() {
+    return {};
+  },
+
+  computed: { ...mapState('yanyuan', ['code']) },
+
+  methods: {
+    // 点击返回按钮
+    onBack() {
+      // eslint-disable-next-line no-undef
+      uni.navigateBack();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>