From c58bc2cd0ad29074d60a01f9353455fc8c9447b7 Mon Sep 17 00:00:00 2001
From: yuan <wang.yuan@joydata.com>
Date: Tue, 2 Jan 2024 11:08:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AD=97=E4=BD=93=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/contact/index.scss      |  4 ++--
 src/components/contact/index.vue       |  2 +-
 src/components/notification/index.scss | 19 ++++++++++++++++---
 src/components/notification/index.vue  | 18 ++++++++----------
 src/pages/contact-edit/index.scss      |  3 +++
 src/pages/contact-edit/index.vue       |  2 +-
 src/pages/contact-new/index.scss       |  3 +++
 src/pages/contact-new/index.vue        |  2 +-
 src/pages/index/index.vue              |  6 +++++-
 9 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/src/components/contact/index.scss b/src/components/contact/index.scss
index 0953b85..d3bcbb6 100644
--- a/src/components/contact/index.scss
+++ b/src/components/contact/index.scss
@@ -2,11 +2,11 @@
   height: auto;
 }
 .company {
-  height: "20rpx";
+  height: 24px;
   line-height: normal;
 }
 .name {
-  font-size:1.5em;
+  font-size: 34px;
   line-height: normal;
 }
 .vip {
diff --git a/src/components/contact/index.vue b/src/components/contact/index.vue
index 629f984..3d45911 100644
--- a/src/components/contact/index.vue
+++ b/src/components/contact/index.vue
@@ -19,7 +19,7 @@ const clickItem = (key: string, item: any)  => {
   <nut-elevator :index-list="props.items" is-sticky :height="(Taro.getSystemInfoSync().windowHeight)-50-32-40" @click-item="clickItem">
   <template #default="{ item }">
       <view class="d-flex flex-row pb-2">
-        <view class="pr-4 pt-2">
+        <view class="pr-4 pt-2 h6">
           <nut-avatar size="normal" color="white" :bg-color="StringUtil.mbString2RgbHex(item.name)">
             <view v-if="StringUtil.getBJXFirstChar(item.name)">{{StringUtil.getBJXFirstChar(item.name)}}</view>
             <view v-else>
diff --git a/src/components/notification/index.scss b/src/components/notification/index.scss
index 97db52b..2929242 100644
--- a/src/components/notification/index.scss
+++ b/src/components/notification/index.scss
@@ -1,6 +1,10 @@
 .card-body {
-  padding-top: 20rpx;
-  padding-bottom: 10rpx;
+  padding-top: 20px;
+  padding-bottom: 10px;
+}
+
+.nut-collapse-item__title-sub {
+  margin-right: 14px;
 }
 .nut-collapse-item .nut-collapse-item__title {
   padding: 0;
@@ -16,10 +20,19 @@
 
 .nut-collapse-item .nut-collapse-item__title .nut-collapse-item__title-sub
 {
-  right: 50rpx;
+  right: 36px;
   color: rgba(0, 0, 0, 0.5);
 }
 
 .nut-collapse-item__border .nut-collapse-item__title::after {
   border-bottom-color: #FFF;
 }
+
+.name {
+  font-size: 34px;
+  line-height: normal;
+}
+.company {
+  height: 24px;
+  line-height: normal;
+}
diff --git a/src/components/notification/index.vue b/src/components/notification/index.vue
index 7eb470d..3eafc7d 100644
--- a/src/components/notification/index.vue
+++ b/src/components/notification/index.vue
@@ -20,21 +20,21 @@ let todayPassJsonObject = JSON.parse(props.todayPassTime)
     <view class="card mr-3 bg-light">
       <view class="card-body">
         <view class="d-flex flex-row">
-          <view class="pr-4 h4">
-            <nut-avatar size="large" color="white" :bg-color="StringUtil.mbString2RgbHex(lastName)">
+          <view class="pr-3 h6">
+            <nut-avatar size="normal" color="white" :bg-color="StringUtil.mbString2RgbHex(lastName)">
               <view>
                 <view v-if="lastName">{{lastName}}</view>
                 <view v-else>
-                  <Text className='fa fa-user fa-lg'/>
+                  <Text className='fa fa-user'/>
                 </view>
               </view>
             </nut-avatar>
           </view>
           <view>
-            <view class="d-flex flex-row pt-2">
-              <view v-if="props.name" class="h4">{{props.name}}</view>
+            <view class="d-flex flex-row">
+              <view v-if="props.name" class="name">{{props.name}}</view>
               <view v-else>
-                <view class="text-black-50 h4">
+                <view class="text-black-50 name">
                   <Text className='text-info fas fa-exclamation-circle'/> 无姓名
                 </view>
               </view>
@@ -43,12 +43,10 @@ let todayPassJsonObject = JSON.parse(props.todayPassTime)
                 <view v-else></view>
               </view>
             </view>
-            <view>
+            <view class="company text-black-50">
               <view v-if="props.company">{{props.company}}</view>
               <view v-else>
-                <view class="text-black-50">
-                  <Text className='text-info fas fa-exclamation-circle'/> 无公司信息
-                </view>
+                <Text className='text-info fas fa-exclamation-circle'/> 无公司信息
               </view>
             </view>
           </view>
diff --git a/src/pages/contact-edit/index.scss b/src/pages/contact-edit/index.scss
index e69de29..e838018 100644
--- a/src/pages/contact-edit/index.scss
+++ b/src/pages/contact-edit/index.scss
@@ -0,0 +1,3 @@
+.save-button {
+  font-size: 36px
+}
diff --git a/src/pages/contact-edit/index.vue b/src/pages/contact-edit/index.vue
index 79d8c2c..f41bf7d 100644
--- a/src/pages/contact-edit/index.vue
+++ b/src/pages/contact-edit/index.vue
@@ -14,7 +14,7 @@ const contactData = Router.getData()
       <view class="text-black-50">更新来访联系人信息，并设置下次到访时间</view>
     </view>
     <view class="pr-2 pt-2">
-      <view class="text-primary">保存</view>
+      <view class="text-primary save-button">保存</view>
     </view>
   </view>
   <ContactForm :data="contactData"/>
diff --git a/src/pages/contact-new/index.scss b/src/pages/contact-new/index.scss
index e69de29..e838018 100644
--- a/src/pages/contact-new/index.scss
+++ b/src/pages/contact-new/index.scss
@@ -0,0 +1,3 @@
+.save-button {
+  font-size: 36px
+}
diff --git a/src/pages/contact-new/index.vue b/src/pages/contact-new/index.vue
index 5e74bd4..7b75518 100644
--- a/src/pages/contact-new/index.vue
+++ b/src/pages/contact-new/index.vue
@@ -11,7 +11,7 @@ import './index.scss'
       <view class="text-black-50">新建来访联系人，并设置到访时间</view>
     </view>
     <view class="pr-2 pt-2">
-      <view class="text-primary">保存</view>
+      <view class="text-primary save-button">保存</view>
     </view>
   </view>
 
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index c843fba..560780c 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -45,7 +45,11 @@ import Notification from "../../components/notification";
       <view class="flex-grow-1"></view>
       <view>最近30天的来访</view>
     </view>
-<!--  <Counter/>-->
+    <view class="p-4">
+    <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">使用电话号码登录</button>
+    </view>
+
+    <!--  <Counter/>-->
     <Notification name="" company="小明科技2" is-vip="true" pass-date="2023-12-25" pass-time="22:22:22" today-pass-time='["22:22:21","22:22:20"]'/>
     <Notification name="王远" company="joydata科技" is-vip="true" pass-date="2023-12-25" pass-time="22:22:22" today-pass-time='[]'/>
     <Notification name="华雨" company="joydata科技" is-vip="false" pass-date="2023-12-25" pass-time="22:22:22" today-pass-time='["22:22:21"]'/>