From 641dcd1607ceb15526ceed8f493cfca4364e1aa8 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Tue, 14 Dec 2021 17:30:41 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 src/components/Info/Info.vue                  | 47 ++++++++++---------
 src/mixins/tool.js                            |  1 -
 .../ConfigInfo/components/CaregiverDetail.vue | 16 +++----
 .../ConfigInfo/components/FamilyDetail.vue    |  4 +-
 .../ConfigInfo/components/MedicineDetail.vue  | 19 +++-----
 src/pagesYanyuan/scan-code/scan-code.vue      |  1 +
 7 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 225e79f..6afff90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -145,6 +145,7 @@
  - | 上下滚动时间轴 | [d533a01](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/d533a01)
  - | 下拉加载定期任务传参，时间格式化修改 | [0b95a0e](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/0b95a0e)
  - | 任务开始时间延迟插件 | [992a313](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/992a313)
+ - | 任务面板样式修改 | [6a2102b](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/6a2102b)
  - | 修改main | [749ae9a](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/749ae9a)
  - | 修改props默认值 | [11b2c24](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/11b2c24)
  - | 修改合并手机号逻辑 | [5d391a3](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/5d391a3)
diff --git a/src/components/Info/Info.vue b/src/components/Info/Info.vue
index 1f267ca..9bf01a1 100644
--- a/src/components/Info/Info.vue
+++ b/src/components/Info/Info.vue
@@ -3,7 +3,7 @@
     <view v-for="(item, index) in infoList" :key="index">
       <template v-for="(colItem, itemIndex) in item">
         <view v-if="colItem.showType === 1" :key="itemIndex" class="flex flex-col mx-4 border-b">
-          <view class="my-3 flex justify-between items-center text-base" @click="changeShow(index, itemIndex)">
+          <view class="my-3 flex justify-between items-center text-sm" @click="changeShow(index, itemIndex)">
             {{ colItem.name }}
             <u-icon name="arrow-up" class="ml-2" color="#909399" v-if="colItem.show"></u-icon>
             <u-icon name="arrow-down" class="ml-2" color="#909399" v-else></u-icon>
@@ -18,7 +18,7 @@
                   :key="radioIndex"
                   :name="radioItem"
                 >
-                  <view class="py-1 text-base">{{ radioItem }}</view>
+                  <view class="py-1">{{ radioItem }}</view>
                 </u-radio>
               </u-radio-group>
               <u-input
@@ -39,7 +39,7 @@
                   :key="checkboxIndex"
                   :name="checkboxItem.name"
                 >
-                  <view class="py-1 text-base">{{ checkboxItem.name }}</view>
+                  <view class="py-1">{{ checkboxItem.name }}</view>
                 </u-checkbox>
               </u-checkbox-group>
               <u-input
@@ -53,9 +53,9 @@
             <!-- 失眠 -->
             <view v-if="colItem.type === 10">
               <u-radio-group v-model="colItem.value" class="flex flex-col" @change="change($event, index, itemIndex, colItem.type)">
-                <u-radio class="flex mb-1" :name="0"><text class="py-1 text-base">否</text></u-radio>
+                <u-radio class="flex mb-1" :name="0"><text class="py-1 text-sm">否</text></u-radio>
                 <u-radio class="flex mb-1" :name="1">
-                  <view class="flex flex-nowrap items-center py-1 text-base">
+                  <view class="flex flex-nowrap items-center py-1 text-sm">
                     是，每天能睡
                     <input
                       class="mx-1 w-12 h-6 text-center border-b"
@@ -73,9 +73,9 @@
             <!-- 吸烟 -->
             <view v-if="colItem.type === 11">
               <u-radio-group v-model="colItem.value" class="flex flex-col" @change="change($event, index, itemIndex, colItem.type)">
-                <u-radio class="flex mb-1 w-full" :name="0"><text class="py-1 text-base">否</text></u-radio>
+                <u-radio class="flex mb-1 w-full" :name="0"><text class="py-1 text-sm">否</text></u-radio>
                 <u-radio class="flex mb-1" :name="1">
-                  <view class="flex flex-nowrap items-center py-1 text-base">
+                  <view class="flex flex-nowrap items-center py-1 text-sm">
                     曾经是，但已经戒烟，已戒
                     <input
                       class="mx-1 w-12 h-6 text-center border-b"
@@ -89,7 +89,7 @@
                   </view>
                 </u-radio>
                 <u-radio class="flex mb-1" :name="2">
-                  <view class="flex flex-nowrap items-center py-1 text-base">
+                  <view class="flex flex-nowrap items-center py-1 text-sm">
                     是，烟龄
                     <input
                       class="mx-1 w-12 h-6 text-center border-b"
@@ -115,9 +115,9 @@
             <!-- 饮酒 -->
             <view v-if="colItem.type === 12">
               <u-radio-group v-model="colItem.value" class="flex flex-col" @change="change($event, index, itemIndex, colItem.type)">
-                <u-radio class="flex mb-1" :name="0"><text class="py-1 text-base">否</text></u-radio>
+                <u-radio class="flex mb-1" :name="0"><text class="py-1 text-sm">否</text></u-radio>
                 <u-radio class="flex mb-1" :name="1">
-                  <view class="flex flex-nowrap items-center py-1 text-base">
+                  <view class="flex flex-nowrap items-center py-1 text-sm">
                     曾经是，但已经戒酒，已戒
                     <input
                       class="mx-1 w-12 h-6 text-center border-b"
@@ -130,7 +130,7 @@
                     年
                   </view>
                 </u-radio>
-                <u-radio class="flex mb-1" :name="2"><text class="py-1 text-base">是</text></u-radio>
+                <u-radio class="flex mb-1" :name="2"><text class="py-1 text-sm">是</text></u-radio>
               </u-radio-group>
               <!-- 饮酒种类 -->
               <view class="mt-2 flex flex-col" v-if="colItem.showClasses">
@@ -142,7 +142,7 @@
                     :key="classRadioIndex"
                     :name="radioItem"
                   >
-                    <text class="py-1 text-base">{{ radioItem }}</text>
+                    <text class="py-1 text-sm">{{ radioItem }}</text>
                   </u-radio>
                 </u-radio-group>
                 <u-input
@@ -157,9 +157,9 @@
             <!-- 饮茶 -->
             <view v-if="colItem.type === 13">
               <u-radio-group v-model="colItem.value" class="flex flex-col" @change="change($event, index, itemIndex, colItem.type)">
-                <u-radio class="flex mb-1" :name="0"><text class="py-1 text-base">否</text></u-radio>
+                <u-radio class="flex mb-1" :name="0"><text class="py-1 text-sm">否</text></u-radio>
                 <u-radio class="flex mb-1" :name="1">
-                  <view class="flex flex-nowrap items-center py-1 text-base">
+                  <view class="flex flex-nowrap items-center py-1 text-sm">
                     曾经是，但已经不喝，已不喝
                     <input
                       class="mx-1 w-12 h-6 text-center border-b"
@@ -173,7 +173,7 @@
                   </view>
                 </u-radio>
                 <u-radio class="flex mb-1" :name="2">
-                  <view class="flex flex-nowrap items-center py-1 text-base">
+                  <view class="flex flex-nowrap items-center py-1 text-sm">
                     是，已持续
                     <input
                       class="mx-1 w-12 h-6 text-center border-b"
@@ -197,7 +197,7 @@
                     :key="classIndex"
                     :name="radioItem"
                   >
-                    <text class="py-1 text-base">{{ radioItem }}</text>
+                    <text class="py-1 text-sm">{{ radioItem }}</text>
                   </u-radio>
                 </u-radio-group>
                 <view>饮茶频率</view>
@@ -208,7 +208,7 @@
                     :key="frequencyIndex"
                     :name="radioItem"
                   >
-                    <text class="py-1 text-base">{{ radioItem }}</text>
+                    <text class="py-1 text-sm">{{ radioItem }}</text>
                   </u-radio>
                 </u-radio-group>
               </view>
@@ -222,17 +222,17 @@
                   :key="radioIndex"
                   :name="radioItem.id"
                 >
-                  <view class="py-1 text-base">{{ radioItem.value }}</view>
+                  <view class="py-1 text-sm">{{ radioItem.value }}</view>
                 </u-radio>
               </u-radio-group>
             </view>
           </view>
         </view>
         <view v-else :key="itemIndex" class="mx-4 flex justify-between items-center border-b">
-          <view class="my-3 text-base">{{ colItem.name }}</view>
+          <view class="my-3 text-sm">{{ colItem.name }}</view>
           <!-- 日期: 年月日 -->
           <view v-if="colItem.type === 2">
-            <view @click="changeShow(index, itemIndex)">
+            <view @click="changeShow(index, itemIndex)" class="text-sm">
               <text :class="colItem.value ? '' : 'text-gray-350'">{{ colItem.value || '请选择' }} </text>
               <u-icon name="arrow-right" class="ml-2" color="#909399"></u-icon>
             </view>
@@ -260,7 +260,7 @@
           </view>
           <!-- 单列下拉选框 -->
           <view v-if="colItem.type === 4">
-            <view @click="changeShow(index, itemIndex)">
+            <view @click="changeShow(index, itemIndex)" class="text-sm">
               <text :class="colItem.value ? '' : 'text-gray-350'">{{ colItem.value || '请选择' }} </text>
               <u-icon name="arrow-right" class="mx-2" color="#909399"></u-icon>
             </view>
@@ -275,7 +275,7 @@
           </view>
           <!-- 多列下拉选框 -->
           <view v-if="colItem.type === 7">
-            <view @click="changeShow(index, itemIndex)">
+            <view @click="changeShow(index, itemIndex)" class="text-sm">
               <text :class="colItem.value ? '' : 'text-gray-350'">{{ colItem.value || '请选择' }} </text>
               <u-icon name="arrow-right" class="ml-2" color="#909399"></u-icon>
             </view>
@@ -300,13 +300,14 @@
           </view>
           <!-- 地区选择器 -->
           <view v-if="colItem.type === 9">
-            <view @click="changeShow(index, itemIndex)">
+            <view @click="changeShow(index, itemIndex)" class="text-sm">
               <text :class="colItem.value ? '' : 'text-gray-350'">{{ colItem.value || '请选择' }} </text>
               <u-icon name="arrow-right" class="ml-2" color="#909399"></u-icon>
             </view>
             <u-picker
               @confirm="change($event, index, itemIndex, colItem.type)"
               mode="region"
+              class="text-sm"
               v-model="colItem.show"
               :params="paramsArea"
               :title="colItem.name"
diff --git a/src/mixins/tool.js b/src/mixins/tool.js
index b2e1a0a..048a8d9 100644
--- a/src/mixins/tool.js
+++ b/src/mixins/tool.js
@@ -31,7 +31,6 @@ export default {
       // 工具箱是否被绑定
       if (!toolInfo || !toolInfo.bindUserId || toolInfo.isBind !== 1) {
         console.log('工具箱没有被绑定');
-        // this.$t.page.openPage('/pagesYanyuan/scan-code/scan-code');
         this.$t.page.openPage('/pagesYanyuan/input-code/input-code');
         return;
       }
diff --git a/src/pagesProject/project/components/ConfigInfo/components/CaregiverDetail.vue b/src/pagesProject/project/components/ConfigInfo/components/CaregiverDetail.vue
index 3021e05..be4cfde 100644
--- a/src/pagesProject/project/components/ConfigInfo/components/CaregiverDetail.vue
+++ b/src/pagesProject/project/components/ConfigInfo/components/CaregiverDetail.vue
@@ -1,15 +1,15 @@
 <template>
   <view style="border: 1px solid #e5e5e5">
-    <view v-for="(item, index) in careInfo" :key="index">
+    <view v-for="(item, index) in careInfo" :key="index" class="mx-4">
       <template v-for="(colItem, itemIndex) in item">
         <view v-if="!disabled" :key="itemIndex">
-          <view v-if="colItem.showType === 1" class="flex flex-col text-sm ml-4 border-b">
+          <view v-if="colItem.showType === 1" class="flex flex-col text-sm border-b">
             <view class="my-3 flex justify-between items-center" @click="changeShow(index, itemIndex)">
               {{ colItem.name }}
               <u-icon name="arrow-up" class="mx-2" color="#909399" v-if="colItem.show"></u-icon>
               <u-icon name="arrow-down" class="mx-2" color="#909399" v-else></u-icon>
             </view>
-            <view v-if="colItem.show">
+            <view v-if="colItem.show" class="pb-2">
               <!-- 单选 -->
               <view v-if="colItem.type === 1">
                 <u-radio-group v-model="colItem.value">
@@ -20,7 +20,7 @@
                     :key="radioIndex"
                     :name="radioItem"
                   >
-                    {{ radioItem }}
+                    <view class="py-1">{{ radioItem }}</view>
                   </u-radio>
                 </u-radio-group>
                 <u-input
@@ -34,9 +34,9 @@
             </view>
           </view>
           <view v-else :key="itemIndex" class="flex justify-between items-center text-sm border-b">
-            <view class="ml-4 my-3">{{ colItem.name }}</view>
+            <view class="my-3">{{ colItem.name }}</view>
             <!-- 数字输入框 -->
-            <view v-if="colItem.type === 3" class="pr-7">
+            <view v-if="colItem.type === 3" class="pr-3">
               <u-input
                 v-model="colItem.value"
                 type="number"
@@ -47,7 +47,7 @@
               />
             </view>
             <!-- 带小数点的数字键盘 -->
-            <view v-if="colItem.type === 4" class="pr-7">
+            <view v-if="colItem.type === 4" class="pr-3">
               <view @click="change($event, index, itemIndex, colItem.type)" class="w-24 text-right" v-if="colItem.value">
                 {{ colItem.value }}
               </view>
@@ -64,7 +64,7 @@
               ></u-keyboard>
             </view>
             <!-- input 文本输入框 -->
-            <view v-if="colItem.type === 8" class="pr-7">
+            <view v-if="colItem.type === 8" class="pr-3">
               <u-input
                 v-model="colItem.value"
                 :clearable="false"
diff --git a/src/pagesProject/project/components/ConfigInfo/components/FamilyDetail.vue b/src/pagesProject/project/components/ConfigInfo/components/FamilyDetail.vue
index fcbabc3..a2b16cf 100644
--- a/src/pagesProject/project/components/ConfigInfo/components/FamilyDetail.vue
+++ b/src/pagesProject/project/components/ConfigInfo/components/FamilyDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <view style="border: 1px solid #e5e5e5">
-    <view class="flex flex-col text-sm" v-for="(family, index) in familyInfo" :key="index">
-      <view class="flex justify-between items-center p-3 border-b">
+    <view class="flex flex-col text-sm mx-4" v-for="(family, index) in familyInfo" :key="index">
+      <view class="flex justify-between items-center py-3 border-b">
         <text>{{ family.name }}</text>
         <u-avatar :src="family.value" mode="square" v-if="family.label === 'avatarUrl'"></u-avatar>
         <view v-else-if="family.label === 'sex'" class="text-gray-400">
diff --git a/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue b/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue
index 247aab1..f33d3c0 100644
--- a/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue
+++ b/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue
@@ -3,8 +3,8 @@
     <view v-for="(item, index) in medicineInfo" :key="index">
       <view class="pl-4 py-3 font-bold border-b">{{ item.title }}</view>
       <template v-for="(colItem, itemIndex) in item.date">
-        <view :key="itemIndex" class="flex justify-between items-center text-sm border-b">
-          <view class="ml-4 my-3">{{ colItem.name }}</view>
+        <view :key="itemIndex" class="flex justify-between mx-4 items-center text-sm border-b">
+          <view class="my-3">{{ colItem.name }}</view>
           <!-- 单选 -->
           <view v-if="colItem.type === 1">
             <u-radio-group v-model="colItem.value" class="flex items-center">
@@ -33,10 +33,10 @@
                 :title="colItem.name"
               ></u-picker>
             </view>
-            <view class="text-gray-350 pr-7" v-else>无需填写</view>
+            <view class="text-gray-350 pr-3" v-else>无需填写</view>
           </view>
           <!-- 数字输入框 -->
-          <view v-if="colItem.type === 3" class="pr-7">
+          <view v-if="colItem.type === 3" class="pr-3">
             <u-input
               v-model="colItem.value"
               type="number"
@@ -66,15 +66,8 @@
       <view class="w-full h-2 bg-gray-100" v-if="index !== medicineInfo.length - 1"></view>
     </view>
 
-    <view class="flex flex-nowrap border-b py-1">
-      <u-input
-        :clearable="false"
-        class="pl-4"
-        style="width: 100px"
-        placeholder="其他药物"
-        v-model="otherName.value"
-        @blur="changeOther(otherName)"
-      />
+    <view class="flex flex-nowrap border-b mx-4 py-1">
+      <u-input :clearable="false" style="width: 100px" placeholder="其他药物" v-model="otherName.value" @blur="changeOther(otherName)" />
       <u-input
         :clearable="false"
         class="flex-1"
diff --git a/src/pagesYanyuan/scan-code/scan-code.vue b/src/pagesYanyuan/scan-code/scan-code.vue
index e7a32a7..fcdbd13 100644
--- a/src/pagesYanyuan/scan-code/scan-code.vue
+++ b/src/pagesYanyuan/scan-code/scan-code.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- 已废弃 -->
   <view>
     <!--scan.wxml-->
     <!-- <view class="scan-view">