From 8b7d077bddecb4732929335063fe14154f508024 Mon Sep 17 00:00:00 2001
From: yuan <wang.yuan@joydata.com>
Date: Tue, 2 Jan 2024 16:53:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0background?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/contact-form/index.scss |  6 +++
 src/components/contact/index.scss      |  9 +++-
 src/components/contact/index.vue       |  2 +-
 src/pages/contact-edit/index.config.ts |  4 +-
 src/pages/contact-edit/index.scss      | 14 +++++
 src/pages/contact-edit/index.vue       | 74 +++++++++++++++++---------
 src/pages/contact-new/index.config.ts  |  4 +-
 src/pages/contact-new/index.scss       | 13 +++++
 src/pages/contact-new/index.vue        | 33 +++++++++---
 src/pages/contact/index.config.ts      |  3 +-
 src/pages/contact/index.scss           | 12 +++++
 src/pages/contact/index.vue            | 46 ++++++++++++----
 src/pages/invite/index.config.ts       |  4 +-
 src/pages/invite/index.scss            | 14 +++++
 src/pages/settings/index.config.ts     |  4 +-
 src/pages/settings/index.scss          | 14 +++++
 16 files changed, 207 insertions(+), 49 deletions(-)
 create mode 100644 src/pages/invite/index.scss
 create mode 100644 src/pages/settings/index.scss

diff --git a/src/components/contact-form/index.scss b/src/components/contact-form/index.scss
index 3e48000..3dab574 100644
--- a/src/components/contact-form/index.scss
+++ b/src/components/contact-form/index.scss
@@ -1,3 +1,9 @@
+.nut-cell {
+  background: transparent !important;
+}
+.nut-cell-group__wrap {
+  background: transparent !important;
+}
 .suggestions {
   position: absolute;
   z-index: 10;
diff --git a/src/components/contact/index.scss b/src/components/contact/index.scss
index d3bcbb6..84bafd3 100644
--- a/src/components/contact/index.scss
+++ b/src/components/contact/index.scss
@@ -1,6 +1,13 @@
-.nut-elevator__list__item__name {
+.nut-elevator__list {
+  height: 100% !important;
+}
+  .nut-elevator__list__item__name {
   height: auto;
 }
+.nut-searchbar {
+  background: transparent;
+}
+
 .company {
   height: 24px;
   line-height: normal;
diff --git a/src/components/contact/index.vue b/src/components/contact/index.vue
index 3d45911..233b8a7 100644
--- a/src/components/contact/index.vue
+++ b/src/components/contact/index.vue
@@ -16,7 +16,7 @@ const clickItem = (key: string, item: any)  => {
 </script>
 
 <template>
-  <nut-elevator :index-list="props.items" is-sticky :height="(Taro.getSystemInfoSync().windowHeight)-50-32-40" @click-item="clickItem">
+  <nut-elevator :index-list="props.items" is-sticky style="height: 100% !important;" @click-item="clickItem">
   <template #default="{ item }">
       <view class="d-flex flex-row pb-2">
         <view class="pr-4 pt-2 h6">
diff --git a/src/pages/contact-edit/index.config.ts b/src/pages/contact-edit/index.config.ts
index b6d4dab..5662c12 100644
--- a/src/pages/contact-edit/index.config.ts
+++ b/src/pages/contact-edit/index.config.ts
@@ -1,4 +1,6 @@
 export default definePageConfig({
   navigationBarTitleText: '',
-  usingComponents: {}
+  usingComponents: {},
+  navigationStyle: 'custom',
+  disableScroll: true
 })
diff --git a/src/pages/contact-edit/index.scss b/src/pages/contact-edit/index.scss
index e838018..50eebe6 100644
--- a/src/pages/contact-edit/index.scss
+++ b/src/pages/contact-edit/index.scss
@@ -1,3 +1,17 @@
+page {
+  height: 100%;
+}
+
+.nut-navbar {
+  background: transparent;
+}
+
+.scroll {
+  flex: 1;
+  overflow: scroll;
+}
+
 .save-button {
   font-size: 36px
 }
+
diff --git a/src/pages/contact-edit/index.vue b/src/pages/contact-edit/index.vue
index f41bf7d..aa87c72 100644
--- a/src/pages/contact-edit/index.vue
+++ b/src/pages/contact-edit/index.vue
@@ -5,38 +5,60 @@ import './index.scss'
 
 const contactData = Router.getData()
 // const contactData = JSON.stringify(contactDataString)
+
+const goBack = () => {
+  Router.back()
+}
 </script>
 
 <template>
-  <view class="p-3 d-flex">
-    <view class="flex-grow-1">
-      <view class="h2">更新联系人</view>
-      <view class="text-black-50">更新来访联系人信息，并设置下次到访时间</view>
+
+
+  <view class="h-100 d-flex flex-column">
+    <BackgroundBasic/>
+    <NutNavbar title=""></NutNavbar>
+    <view class="p-3 d-flex">
+      <view class="flex-grow-1">
+        <view class="h2">
+          <Text className="fas fa-chevron-left text-primary" @tap="goBack()"/>
+          更新联系人
+        </view>
+        <view class="text-black-50">更新来访联系人信息，并设置下次到访时间</view>
+      </view>
+      <view class="d-flex align-items-end">
+        <view class="text-primary save-button">保存</view>
+      </view>
     </view>
-    <view class="pr-2 pt-2">
-      <view class="text-primary save-button">保存</view>
+
+
+    <view class="scroll">
+      <ContactForm :data="contactData"/>
+
+      <nut-cell title="来访记录">
+        <template #desc>
+          <Text className="fas fa-chevron-right"/>
+        </template>
+      </nut-cell>
+
+      <nut-cell title="编辑记录" sub-title="本联系人在公司中的所有信息修改记录">
+        <template #desc>
+          <Text className="fas fa-chevron-right"/>
+        </template>
+      </nut-cell>
+
+      <view class="p-3">
+        <nut-button block color="red" plain>加入黑名单</nut-button>
+      </view>
+
+      <view class="p-3 pb-5">
+        <nut-button block color="red">删除联系人</nut-button>
+      </view>
     </view>
   </view>
-  <ContactForm :data="contactData"/>
-
-  <nut-cell title="来访记录">
-    <template #desc>
-      <Text className="fas fa-chevron-right"/>
-    </template>
-  </nut-cell>
-
-  <nut-cell title="编辑记录" sub-title="本联系人在公司中的所有信息修改记录">
-    <template #desc>
-      <Text className="fas fa-chevron-right"/>
-    </template>
-  </nut-cell>
-
-  <view class="p-3">
-    <nut-button block color="red" plain>加入黑名单</nut-button>
-  </view>
 
-  <view class="p-3">
-    <nut-button block color="red">删除联系人</nut-button>
-  </view>
+
+
+
+
 
 </template>
diff --git a/src/pages/contact-new/index.config.ts b/src/pages/contact-new/index.config.ts
index b6d4dab..5662c12 100644
--- a/src/pages/contact-new/index.config.ts
+++ b/src/pages/contact-new/index.config.ts
@@ -1,4 +1,6 @@
 export default definePageConfig({
   navigationBarTitleText: '',
-  usingComponents: {}
+  usingComponents: {},
+  navigationStyle: 'custom',
+  disableScroll: true
 })
diff --git a/src/pages/contact-new/index.scss b/src/pages/contact-new/index.scss
index e838018..0d533c6 100644
--- a/src/pages/contact-new/index.scss
+++ b/src/pages/contact-new/index.scss
@@ -1,3 +1,16 @@
+page {
+  height: 100%;
+}
+
+.nut-navbar {
+  background: transparent;
+}
+
+.scroll {
+  flex: 1;
+  overflow: scroll;
+}
+
 .save-button {
   font-size: 36px
 }
diff --git a/src/pages/contact-new/index.vue b/src/pages/contact-new/index.vue
index 7b75518..9f76fa2 100644
--- a/src/pages/contact-new/index.vue
+++ b/src/pages/contact-new/index.vue
@@ -2,18 +2,37 @@
 import { Router } from 'tarojs-router-next'
 import './index.scss'
 
+const goBack = () => {
+  Router.back()
+}
+
 </script>
 
 <template>
-  <view class="p-3 d-flex">
-    <view class="flex-grow-1">
-      <view class="h2">新来访人</view>
-      <view class="text-black-50">新建来访联系人，并设置到访时间</view>
+
+  <view class="h-100 d-flex flex-column">
+    <BackgroundBasic/>
+    <NutNavbar title=""></NutNavbar>
+    <view class="p-3 d-flex">
+      <view class="flex-grow-1">
+        <view class="h2">
+          <Text className="fas fa-chevron-left text-primary" @tap="goBack()"/>
+          新来访人
+        </view>
+        <view class="text-black-50">新建来访联系人，并设置到访时间</view>
+      </view>
+      <view class="d-flex align-items-end">
+        <view class="text-primary save-button">保存</view>
+      </view>
     </view>
-    <view class="pr-2 pt-2">
-      <view class="text-primary save-button">保存</view>
+
+
+    <view class="scroll pb-5">
+      <ContactForm/>
     </view>
+
+
   </view>
 
-  <ContactForm/>
+
 </template>
diff --git a/src/pages/contact/index.config.ts b/src/pages/contact/index.config.ts
index b606c05..23a43d6 100644
--- a/src/pages/contact/index.config.ts
+++ b/src/pages/contact/index.config.ts
@@ -1,5 +1,6 @@
 export default definePageConfig({
   navigationBarTitleText: '',
   usingComponents: {},
-  disableScroll: true
+  navigationStyle: 'custom',
+  disableScroll: true,
 })
diff --git a/src/pages/contact/index.scss b/src/pages/contact/index.scss
index e69de29..34e6b03 100644
--- a/src/pages/contact/index.scss
+++ b/src/pages/contact/index.scss
@@ -0,0 +1,12 @@
+page {
+  height: 100%;
+}
+
+.nut-navbar {
+  background: transparent;
+}
+
+.scroll {
+  flex: 1;
+  overflow: scroll;
+}
diff --git a/src/pages/contact/index.vue b/src/pages/contact/index.vue
index e5df73d..b01d76a 100644
--- a/src/pages/contact/index.vue
+++ b/src/pages/contact/index.vue
@@ -37,6 +37,23 @@ const data = ref([
       { id: 10, name: '何同学', isVIP: false, company: null, avatar: null },
       { id: 11, name: '韩红', isVIP: false, company: null, avatar: null },
       { id: 12, name: '洪秀权', isVIP: false, company: null, avatar: null },
+      { id: 13, name: '何同学', isVIP: false, company: null, avatar: null },
+      { id: 14, name: '韩红', isVIP: false, company: null, avatar: null },
+      { id: 15, name: '洪秀权', isVIP: false, company: null, avatar: null },
+      { id: 16, name: '何同学', isVIP: false, company: null, avatar: null },
+      { id: 17, name: '韩红', isVIP: false, company: null, avatar: null },
+      { id: 18, name: '洪秀权', isVIP: false, company: null, avatar: null },
+      { id: 19, name: '韩红', isVIP: false, company: null, avatar: null },
+      { id: 20, name: '洪秀权', isVIP: false, company: null, avatar: null },
+      { id: 21, name: '韩红', isVIP: false, company: null, avatar: null },
+      { id: 22, name: '洪秀权', isVIP: false, company: null, avatar: null },
+      { id: 23, name: '何同学', isVIP: false, company: null, avatar: null },
+      { id: 24, name: '韩红', isVIP: false, company: null, avatar: null },
+      { id: 25, name: '洪秀权', isVIP: false, company: null, avatar: null },
+      { id: 26, name: '何同学', isVIP: false, company: null, avatar: null },
+      { id: 27, name: '韩红', isVIP: false, company: null, avatar: null },
+      { id: 28, name: '洪秀权', isVIP: false, company: null, avatar: null },
+      { id: 29, name: '韩红', isVIP: false, company: null, avatar: null },
     ]
   }
 ]);
@@ -44,20 +61,31 @@ const data = ref([
 </script>
 
 <template>
-  <view class="index">
+  <view class="h-100 d-flex flex-column">
+    <BackgroundBasic/>
+    <NutNavbar title=""></NutNavbar>
     <view class="pl-3 pt-3 pr-3 h2 d-flex">
       <view class="flex-grow-1">
         通讯录
       </view>
-      <view class="pr-2">
-        <Text className="fas fa-plus-circle text-primary" @tap="Router.toContactNew()" />
+    </view>
+    <View class="d-flex">
+        <nut-searchbar v-model="val" class="flex-grow-1">
+          <template #rightin>
+            <Text className="fas fa-search text-black-50"/>
+          </template>
+        </nut-searchbar>
+      <view class="d-flex align-items-center pr-3">
+        <Text className="fas fa-plus-circle text-primary fa-2x" @tap="Router.toContactNew()" />
       </view>
+    </View>
+
+
+    <view class="scroll">
+      <Contact :items="data" style="height: 100%"/>
     </view>
-    <nut-searchbar v-model="val">
-      <template #rightin>
-        <Text className="fas fa-search text-black-50"/>
-      </template>
-    </nut-searchbar>
-    <Contact :items="data" style="height: 100%"/>
   </view>
+
+
+
 </template>
diff --git a/src/pages/invite/index.config.ts b/src/pages/invite/index.config.ts
index b6d4dab..5662c12 100644
--- a/src/pages/invite/index.config.ts
+++ b/src/pages/invite/index.config.ts
@@ -1,4 +1,6 @@
 export default definePageConfig({
   navigationBarTitleText: '',
-  usingComponents: {}
+  usingComponents: {},
+  navigationStyle: 'custom',
+  disableScroll: true
 })
diff --git a/src/pages/invite/index.scss b/src/pages/invite/index.scss
new file mode 100644
index 0000000..1251ddd
--- /dev/null
+++ b/src/pages/invite/index.scss
@@ -0,0 +1,14 @@
+page {
+    height: 100%;
+}
+
+.nut-navbar {
+    background: transparent;
+}
+
+.scroll {
+    flex: 1;
+    overflow: scroll;
+}
+
+
diff --git a/src/pages/settings/index.config.ts b/src/pages/settings/index.config.ts
index b6d4dab..5662c12 100644
--- a/src/pages/settings/index.config.ts
+++ b/src/pages/settings/index.config.ts
@@ -1,4 +1,6 @@
 export default definePageConfig({
   navigationBarTitleText: '',
-  usingComponents: {}
+  usingComponents: {},
+  navigationStyle: 'custom',
+  disableScroll: true
 })
diff --git a/src/pages/settings/index.scss b/src/pages/settings/index.scss
new file mode 100644
index 0000000..1251ddd
--- /dev/null
+++ b/src/pages/settings/index.scss
@@ -0,0 +1,14 @@
+page {
+    height: 100%;
+}
+
+.nut-navbar {
+    background: transparent;
+}
+
+.scroll {
+    flex: 1;
+    overflow: scroll;
+}
+
+