From 0922aae4f163014e0becdab90df9312d7a5ccd98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Wed, 23 Feb 2022 17:02:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E5=9C=B0=E5=8C=BA+?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mods/AppAddressBook/AppAddressBook.vue | 67 ++++++++++------------
 1 file changed, 30 insertions(+), 37 deletions(-)

diff --git a/src/mods/AppAddressBook/AppAddressBook.vue b/src/mods/AppAddressBook/AppAddressBook.vue
index 15b0b49..bec12f5 100644
--- a/src/mods/AppAddressBook/AppAddressBook.vue
+++ b/src/mods/AppAddressBook/AppAddressBook.vue
@@ -1,23 +1,22 @@
 <template>
   <div class="wrapper">
-    <AiTopFixed>
-      <div class="searchObj">
-        <u-search v-model="name" ref="searchObj" placeholder="请输入姓名或电话" :show-action="false" clearabled bg-color="#fff" search-icon-color="#6AA8F8" placeholder-color="#D0D4D4" @search="handerSearch" @clear=";(index = []), (name = ''), getList()" />
-      </div>
-    </AiTopFixed>
+    <div class="searAreName">
+      <AiAreaPicker ref="area" class="ai-area" :value="areaId" :name.sync="areaName" :areaId="$areaId" @select="areaSelect">
+        <div class="ai-area__wrapper">
+          <span class="label" v-if="areaName">{{ areaName }}</span>
+          <span v-else>请选择</span>
+          <u-icon name="arrow-down" color="#666" size="24" style="margin-left: 4px"></u-icon>
+        </div>
+      </AiAreaPicker>
 
-    <!-- <div class="areaSelection">
-      <div class="area">区域选择</div>
-      <div class="select">
-        <AiAreaPicker ref="area" class="ai-area" :value="areaId" :name.sync="areaName" :areaId="$areaId" @select="areaSelect">
-          <div class="ai-area__wrapper">
-            <span class="label" v-if="areaName">{{ areaName }}</span>
-            <span v-else>请选择</span>
-            <u-icon name="arrow-right"></u-icon>
-          </div>
-        </AiAreaPicker>
+      <u-search v-model="name" ref="searchObj" placeholder="请输入名称/类型/电话" :show-action="false" clearabled bg-color="#F5F5F5" search-icon-color="#ccc" placeholder-color="#666" @search="handerSearch" @clear=";(index = []), (name = ''), getList()" style="width: 70%" />
+    </div>
+
+    <!-- <AiTopFixed>
+      <div class="searchObj">
+        <u-search v-model="name" ref="searchObj" placeholder="请输入姓名或电话" :show-action="false" clearabled bg-color="#F5F7F9" search-icon-color="#6AA8F8" placeholder-color="#D0D4D4" @search="handerSearch" @clear=";(index = []), (name = ''), getList()" />
       </div>
-    </div> -->
+    </AiTopFixed> -->
 
     <template v-if="list.length">
       <u-index-list :scrollTop="scrollTop" :index-list="indexList">
@@ -49,16 +48,16 @@ export default {
       indexList: [],
       list: [],
       userInfo: {},
-      // areaId: '',
-      // $areaId: '',
-      // areaName: '',
+      areaId: '',
+      $areaId: '',
+      areaName: '',
       name: '',
     }
   },
   onLoad() {
     this.userInfo = uni.getStorageSync('userInfo')
-    // this.areaId = this.$areaId
-    // this.areaName = this.$areaName
+    this.areaId = this.$areaId
+    this.areaName = this.$areaName
     this.getList()
   },
 
@@ -76,7 +75,7 @@ export default {
           params: {
             isPublic: 1,
             resource: 'portal',
-            // areaId: this.areaId,
+            areaId: this.areaId,
             size: 999,
             name: this.name,
           },
@@ -112,6 +111,14 @@ export default {
 
 <style lang="scss" scoped>
 .wrapper {
+  .searAreName {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 24px 32px;
+    background: #fff;
+  }
+
   ::v-deep .AiTopFixed {
     width: 100%;
     .placeholder {
@@ -131,21 +138,7 @@ export default {
   }
   .searchObj {
     padding: 24px 32px;
-    background: #197df0;
-  }
-}
-.areaSelection {
-  display: flex;
-  justify-content: space-between;
-  box-sizing: border-box;
-  padding: 0 30px;
-  width: 100%;
-  height: 120px;
-  line-height: 120px;
-  background-color: #ffff;
-
-  .select {
-    text-align: right;
+    background: #fff;
   }
 }