From 8fdc5b0ba14ba694dc3f9c1931cfbd617e54998f Mon Sep 17 00:00:00 2001
From: aBin <binbin0314@126.com>
Date: Mon, 5 Dec 2022 18:44:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Demonstration/Demonstration.vue           |  53 +++++++++++-------
 src/components/Test/Test.vue                  |  18 +++---
 .../VolumeProject/VolumeProject.vue           |   3 +-
 src/pages/index/index.vue                     |   2 +-
 src/pages/info/info.vue                       |   4 +-
 src/pages/inner/inner.vue                     |   2 +-
 src/pages/outside/outside.vue                 |   2 +-
 src/pages/patient/patient.vue                 |   2 +-
 src/static/指针.png                           | Bin 0 -> 1101 bytes
 9 files changed, 50 insertions(+), 36 deletions(-)
 create mode 100644 src/static/指针.png

diff --git a/src/components/Demonstration/Demonstration.vue b/src/components/Demonstration/Demonstration.vue
index d38e78a..dd38815 100644
--- a/src/components/Demonstration/Demonstration.vue
+++ b/src/components/Demonstration/Demonstration.vue
@@ -1,24 +1,27 @@
 <template>
-  <div
-    class="demonstration-box w-full flex flex-nowrap"
-    style="padding: 0 16px"
-    :style="{ backgroundColor: detailValueType === 1 ? '#40a9ff' : '#6ea4d1' }"
-    :class="patientInfo && patientInfo.isInfo ? 'justify-between' : 'justify-center'"
-  >
+  <div class="demonstration-box flex flex-nowrap" :class="patientInfo && patientInfo.isInfo ? 'justify-between' : 'justify-center'">
+    <!-- :style="{ backgroundColor: detailValueType === 1 ? '#40a9ff' : '#6ea4d1' }" -->
     <template v-if="patientInfo && patientInfo.isInfo">
-      <div class="flex">
-        <div style="margin-right: 16px">
-          {{ patientInfo.name ? patientInfo.name : '无名氏' }}
-        </div>
-        <div style="margin-right: 16px">
-          <span v-if="patientInfo && (patientInfo.gender || patientInfo.gender === 0)">
-            {{ patientInfo.gender === 0 ? '女' : '男' }}
-          </span>
-          <span v-else>-</span>
-        </div>
-        <div>
-          {{ patientInfo.age ? patientInfo.age + '岁' : '-' }}
-        </div>
+      <div class="w-full flex justify-between">
+        <view class="flex items-center">
+          <!-- <u-icon name="clock" color="#5990FF" style="margin-right: 4px"></u-icon> -->
+          <img src="@/static/指针.png" style="width: 32rpx; height: 32rpx; margin-right: 4px" alt="" />
+          填写中
+        </view>
+        <view class="flex">
+          <div style="margin-right: 4px">
+            {{ patientInfo.name ? patientInfo.name : '无名氏' }}
+          </div>
+          <div style="margin-right: 4px">
+            <span v-if="patientInfo && (patientInfo.gender || patientInfo.gender === 0)">
+              {{ patientInfo.gender === 0 ? '女' : '男' }}
+            </span>
+            <span v-else>-</span>
+          </div>
+          <div>
+            {{ patientInfo.age ? patientInfo.age + '岁' : '-' }}
+          </div>
+        </view>
       </div>
     </template>
     <div>
@@ -60,12 +63,20 @@ export default {
 </script>
 <style scoped>
 .demonstration-box {
-  height: 28px;
-  line-height: 28px;
+  width: calc(750rpx - 64rpx);
+  height: 32px;
+  margin: 32rpx 32rpx 0 32rpx;
   text-align: center;
   position: fixed;
+  border-radius: 14px;
+  padding: 16rpx 24rpx;
   color: #fff;
+  background: #e4edff;
   top: 0;
   z-index: 99;
+  font-size: 24rpx;
+  font-family: OPPOSans-Bold, OPPOSans;
+  font-weight: bold;
+  color: #5990ff;
 }
 </style>
diff --git a/src/components/Test/Test.vue b/src/components/Test/Test.vue
index 447c023..61340d3 100644
--- a/src/components/Test/Test.vue
+++ b/src/components/Test/Test.vue
@@ -247,13 +247,15 @@
                     v-for="(check, checkIndex) in listItem.itemIsChecked"
                     :key="checkIndex"
                     :style="{ minWidth: listItem.checkType - 0 === 3 ? '33%' : listItem.checkType - 0 === 2 ? '50%' : 0 }"
-                    class="my-2 flex items-center"
+                    class="w-full my-2 flex flex-1 flex-col items-start justify-center"
                   >
-                    <u-checkbox v-model="check.isChecked" :name="listItem.itemList[checkIndex]">
-                      <span :style="{ color: check.isChecked ? '#1890ff' : '' }">
+                    <view class="flex">
+                      <view :style="{ color: check.isChecked ? '#1890ff' : '' }" style="width: 628rpx">
                         {{ listItem.itemList[checkIndex] }}
-                      </span>
-                    </u-checkbox>
+                      </view>
+                      <u-checkbox v-model="check.isChecked" :name="listItem.itemList[checkIndex]">
+                      </u-checkbox>
+                    </view>
                     <u-input
                       :border="true"
                       :clearable="false"
@@ -319,8 +321,8 @@
                   class="flex items-center"
                   @click="openDropDown(listItem.title, listItem.itemList, listItem.code, index, listIndex, listItem.value)"
                 >
-                  <span style="margin-right: 10px" v-if="listItem.value">{{ listItem.value }}</span>
-                  <span style="margin-right: 10px" v-else>请选择</span>
+                  <span style="margin-right: 10px;color: #bbb" v-if="listItem.value">{{ listItem.value }}</span>
+                  <span style="margin-right: 10px;color: #bbb" v-else>请选择</span>
                   <!-- <img src="@/static/icon/right.png" style="height: 20px" /> -->
                   <u-icon name="arrow-right" color="#70798C" size="28"></u-icon>
                 </div>
@@ -374,7 +376,7 @@
                       @click="iptChangeRadio(radioValue.name, listItem.code, index, listIndex)"
                       @blur="changeScroeNum($event, listItem.min, listItem.max, radioValue.code, index, listIndex, radioIndex)"
                     />
-                    <span v-else :style="{ color: listItem.value === radioValue.name ? '#1890ff' : '' }">{{ radioValue.name }}</span>
+                    <view v-else class="ipt-radio" :style="{ color: listItem.value === radioValue.name ? '#1890ff' : '' }">{{ radioValue.name }}</view>
                   </u-radio>
                 </u-radio-group>
               </div>
diff --git a/src/components/VolumeProject/VolumeProject.vue b/src/components/VolumeProject/VolumeProject.vue
index 4231d5f..869ef92 100644
--- a/src/components/VolumeProject/VolumeProject.vue
+++ b/src/components/VolumeProject/VolumeProject.vue
@@ -10,7 +10,7 @@
           style="transition: all 0.3s"
         >
           <view class="hos-name">{{ item.name }}</view>
-          <view class="doc-name">{{ item.doctorName }}</view>
+          <view class="doc-name flex items-center justify-center">{{ item.doctorName }}</view>
         </view>
       </swiper-item>
     </swiper>
@@ -94,6 +94,7 @@ export default {
   left: 64rpx;
 }
 .doc-name {
+  min-width: 80rpx;
   background: #ffc83b;
   border-radius: 24rpx;
   font-size: 20rpx;
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 0c3ed39..5d88705 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -558,7 +558,7 @@ page {
   left: 0;
   width: 240rpx;
   text-align: center;
-  bottom: 46rpx;
+  bottom: 48rpx;
   font-size: 20rpx;
   font-family: OPPOSans-Medium, OPPOSans;
   font-weight: 500;
diff --git a/src/pages/info/info.vue b/src/pages/info/info.vue
index a0d4d3e..ee97383 100644
--- a/src/pages/info/info.vue
+++ b/src/pages/info/info.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="info" style="padding-top: 28px">
+  <div class="info" style="padding-top: 42px">
     <Demonstration />
     <div bordered class="list-box bg-white mb-2" v-for="(item, index) in list" :key="index">
       <template v-for="(listItem, listIndex) in item">
@@ -51,7 +51,7 @@
                 class="flex items-center"
                 @click="openDropDown(listItem.title, listItem.itemList, listItem.dropType, getValue(listItem.code))"
               >
-                <span style="margin-right: 10px">{{ getValue(listItem.code) ? getValue(listItem.code) : '请选择' }}</span>
+                <span style="margin-right: 10px; color: #bbb">{{ getValue(listItem.code) ? getValue(listItem.code) : '请选择' }}</span>
                 <u-icon name="arrow-right" color="#70798C" size="28"></u-icon>
               </div>
             </div>
diff --git a/src/pages/inner/inner.vue b/src/pages/inner/inner.vue
index ef980d0..3291314 100644
--- a/src/pages/inner/inner.vue
+++ b/src/pages/inner/inner.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="inner" style="padding-top: 28px; padding-bottom: 50rpx">
+  <div class="inner" style="padding-top: 42px; padding-bottom: 50rpx">
     <Demonstration />
     <div class="w-full" v-for="(item, index) in testList" :key="index">
       <template v-if="item.testType === 1">
diff --git a/src/pages/outside/outside.vue b/src/pages/outside/outside.vue
index a8b47bb..f763d10 100644
--- a/src/pages/outside/outside.vue
+++ b/src/pages/outside/outside.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="w-full flex flex-col flex-wrap" style="padding-bottom: 20px; padding-top: 28px">
+  <div class="w-full flex flex-col flex-wrap" style="padding-bottom: 20px; padding-top: 42px">
     <Demonstration />
     <div class="w-full" v-for="(item, index) in testList" :key="index">
       <template v-if="item.testType === 1">
diff --git a/src/pages/patient/patient.vue b/src/pages/patient/patient.vue
index 295ce96..38adb9e 100644
--- a/src/pages/patient/patient.vue
+++ b/src/pages/patient/patient.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="establish bg-gray-100" style="padding-top: 28px">
+  <div class="establish bg-gray-100" style="padding-top: 42px">
     <Demonstration />
     <div bordered class="list-box bg-white" v-for="(item, index) in list" :key="index">
       <div
diff --git a/src/static/指针.png b/src/static/指针.png
new file mode 100644
index 0000000000000000000000000000000000000000..70d948ed0a66940d3ca786b68f6634dbaa3c689e
GIT binary patch
literal 1101
zcmV-T1hV^yP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm001mY
z001mY0i`{bsQ>@~0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1L8?UK~#7F?VHbQ
z)Ib!+zw1R%ls&ZPM!k9Iih@10IeICG?Mczrzo11=1*Llsdh6;<Pu*JdRuB{vJ#_0y
zq0ssVXtw7TEDD0B@qIT*&2E$3q?^f)O+PT3-DJq-ee*K&GV`Vc%_yZtWMfLHNHLsJ
zcD7!cQVyK$j$2Bl(k}9b7(F4SCdE?yV@X-zIgw@L0?SesrTkR-u%yf=+pDrcLWXz3
z|Ei@fgj~R!O4jgBEGaWc8u?R0%7)4gmP*PSRQh*42wu}1bfWC%F6%5p2g>e>^1@13
zyGmgy$qBb%2QqnrLDZFAl}`1l;Ha55<4GloC-|c5{yp#1y4hIjVmw>ar_jLOFW|)|
z3HtYdKYxL1mw>zD!0>tKVqPAHXMP8K1rXy6+3>k9BW7s)!fV@bFK12zOSiR&z?ZCw
z--}gH8?XTl#*?+pqs9~Nd;Sr+pe=R314jf<c4%op6I(xmkL~V5C#LcVl-dMvT)&Ex
z@biqAsfvwlp55sIRLH>KLgU-K;7|bP?$2WInfH2u*8@1>qNU->7;RqQ6`+dZFz<e8
z383upHUq_>?AUzh0kbF`H~HZTV4`@~0ywR|f#Shoy%BoAD2j_o0rL2+9~YIP3t&(H
z1I48!KoO$9Aj&5mfP#}b0Ty1_!)8g5IRQ8-^kh9b5hy?t2{L@HcO4p^kO)l*aDW6E
zzZ|ZfJ9@nJ9XdHk+ykb@fU6h7)#VuB@;hMt3v|&;TmbTL61Wi|{#^g6O@ti^@C_+&
zPlh9IT@PQMBD~y0-0YN`*I^4O@m}Vi);@=?KQaV7n2c=($!JZDi3k+HKuU0qkga~$
zc>x;#XsT}!nle>(!HomnAVrK}dtPuTL>Eb7>Lwff$b<ldck}UdG!fWM_94P5KUxBa
zE3kP<G#>DSA}rmB)=hrc#&MwgH~7UH3Tw#)h|1a1(Yi^tAIG5Te(?&x1cKDPz$I!o
z83EeZaDN;MATGfJneYOa=`lNVq#I#FYY%mAqC{JUh%;%(E-_Q1M0E4zx4{1I_Wf)t
z__#zll@v2j0HQNDs2|wcGaTlY=`_qMnuvb)XT|tc?~b4xA*RTf7%W<WPv_2{0g?O2
zP=go)w8iv0;46SA)x=;;msgLq^hV_)Il349B~Pn-B}sSEGgbB^SsEd5PE<#JsE08=
zGAbX*(>3Ts6?w^wM+9b9SSmYgs5F+)DSHv4rP3q0yWT|vdP7Ymzi@I<b>#h~iX+5~
z((4h~Gu#ikK&GazsQ4C7)5A<?AXFgK56Yf*U=THm|4Zn5EuUxMgiXVFFVV(7*oQ4?
Tjz^4e00000NkvXXu0mjfmd^aU

literal 0
HcmV?d00001