From 8a7f8b749b4efa7fd84e30812b7373f4bbcec177 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 9 Aug 2022 16:44:56 +0800
Subject: [PATCH] 2

---
 src/project/saas/AppBuilding/AppBuilding.vue  |   8 +-
 src/project/saas/AppBuilding/SelectGird.vue   | 253 ++++++++++++++++++
 .../components/img/gird--select-icon.png      | Bin 0 -> 1276 bytes
 .../components/img/search-icon-w.png          | Bin 0 -> 766 bytes
 .../saas/AppBuilding/components/img/xz.png    | Bin 0 -> 1489 bytes
 .../saas/AppBuilding/components/img/xzh.png   | Bin 0 -> 1730 bytes
 .../saas/AppBuilding/components/searchMap.vue | 122 +++++----
 src/project/saas/AppBuilding/list.vue         |   4 +-
 8 files changed, 335 insertions(+), 52 deletions(-)
 create mode 100644 src/project/saas/AppBuilding/SelectGird.vue
 create mode 100644 src/project/saas/AppBuilding/components/img/gird--select-icon.png
 create mode 100644 src/project/saas/AppBuilding/components/img/search-icon-w.png
 create mode 100644 src/project/saas/AppBuilding/components/img/xz.png
 create mode 100644 src/project/saas/AppBuilding/components/img/xzh.png

diff --git a/src/project/saas/AppBuilding/AppBuilding.vue b/src/project/saas/AppBuilding/AppBuilding.vue
index 048f4a8c..a4b63291 100644
--- a/src/project/saas/AppBuilding/AppBuilding.vue
+++ b/src/project/saas/AppBuilding/AppBuilding.vue
@@ -29,10 +29,10 @@ export default {
     }
   },
   onShow() {
-    this.show = false
-    this.$nextTick(() => {
-      this.show = true
-    })
+    // this.show = false
+    // this.$nextTick(() => {
+    //   this.show = true
+    // })
     document.title = "以房找人"
   },
 }
diff --git a/src/project/saas/AppBuilding/SelectGird.vue b/src/project/saas/AppBuilding/SelectGird.vue
new file mode 100644
index 00000000..4831b0c1
--- /dev/null
+++ b/src/project/saas/AppBuilding/SelectGird.vue
@@ -0,0 +1,253 @@
+<template>
+  <div class="SelectGird">
+    <div class="header-middle">
+      <div class="hint">
+        <span v-for="(item, index) in slectList" :key="index">
+          <span v-if="index" style="margin:0 4px;" v-text="`/`"/>
+          <span style="color:#3F8DF5" @click="girdNameClick(item, index)" v-text="item.girdName"/>
+        </span>
+      </div>
+      <div class="showTypes">
+        <div v-if="treeList.length > 0">
+          <div class="cards" v-for="(item, index) in treeList" :key="index" @click="itemClick(item)">
+            <div class="imges">
+              <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
+                   @click.stop="girdClick(item, index)"/>
+              <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click.stop="girdClick(item, index)"/>
+              <img src="./components/img/gird--select-icon.png" alt="" class="avatras"/>
+            </div>
+            <div class="rightes fill">
+              <div class="applicationNames fill">{{ item.girdName }}</div>
+            </div>
+          </div>
+        </div>
+        <AiEmpty :description="isGridMember?`暂无数据`:`当前人员不是网格员或网格管理员`" class="emptyWrap" v-else/>
+      </div>
+    </div>
+    <div class="subBtn" @click="submit">
+      <div>确定选择</div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {mapState} from "vuex";
+
+  export default {
+    name: 'SelectGird',
+    data() {
+      return {
+        SelectGird: {},
+        allData: null,
+        treeList: [],
+        slectList: [],
+        userList: [],
+        parentGirdId: '',
+        isFormMap: 0, //1为网格地图 一级不允许选中
+      }
+    },
+    computed: {
+      ...mapState(['user']),
+      isMyGirds() {
+        return !!this.$route.query.self
+      },
+      isGridMember() {
+        return this.user.girdCheckType > 0
+      }
+    },
+    onLoad(option) {
+      if (option.isFormMap) {
+        this.isFormMap = option.isFormMap
+      }
+      this.isGridMember ? this.getAllGrids() : this.$u.toast('当前人员不是网格员或网格管理员')
+    },
+    methods: {
+      getAllGrids() {
+        this.slectList = []
+        let {girdMemberId} = this.user,
+            url = `/app/appgirdinfo/queryAppGirdInfoByGirdLevel`,
+            params = {girdMemberId}
+        if (this.isMyGirds) {
+          url = `/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser`
+          params = {}
+        }
+        this.$http.post(url, null, {params}).then((res) => {
+          if (res?.data) {
+            let parents = res.data.map(e => e.parentGirdId)
+            this.allData = res.data.map(e => ({...e, hasChildren: parents.includes(e.id)}))
+            this.treeInit()
+          }
+        })
+      },
+      treeInit() {
+        let last = uni.getStorageSync("lastSelectedGrid")
+        if (last) {
+          this.$http.post("/app/appgirdinfo/listFatherGirdInfo", null, {
+            params: {girdId: last}
+          }).then(res => {
+            if (res?.data) {
+              this.slectList = [{girdName: '可选范围', id: ''}, res.data].flat()
+              this.getGridsByGridMemberAndParent({id: last})
+            }
+          })
+        } else {
+          this.treeList = this.allData.filter(e => !e.parentGirdId || this.isMyGirds)
+          this.treeList.map((item) => item.isChecked = false)
+          let obj = {girdName: '可选范围', id: ''}
+          this.slectList.push(obj)
+        }
+      },
+      itemClick(row) {
+        if (row.hasChildren) {
+          let obj = {
+            girdName: row.girdName,
+            id: row.id,
+          }
+          this.slectList.push(obj)
+          this.getGridsByGridMemberAndParent(row)
+        }
+      },
+      getGridsByGridMemberAndParent(row) {
+        let {id: parentGirdId} = row
+        this.treeList = this.allData.filter(e => e.parentGirdId == parentGirdId)
+      },
+      girdNameClick(row, index) {
+        this.userList = []
+        if (!index) { //第一级别
+          this.slectList = []
+          this.treeInit()
+        } else {
+          var list = []
+          this.slectList.map((item, i) => {
+            if (i <= index) {
+              list.push(item)
+            }
+          })
+          this.slectList = list
+          this.getGridsByGridMemberAndParent(row)
+        }
+      },
+      girdClick(row, index) {
+        if (this.treeList[index].isChecked) {//取消
+          this.treeList[index].isChecked = false
+          this.SelectGird = {}
+        } else {
+          this.treeList.map((item) => {
+            item.isChecked = false
+          })
+          this.treeList[index].isChecked = true
+          this.SelectGird = row
+        }
+        this.$forceUpdate()
+      },
+      submit() {
+        if (this.SelectGird.id != null) {
+          uni.setStorageSync("lastSelectedGrid", this.SelectGird.parentGirdId)
+          uni.navigateBack({
+            success: () => {
+              uni.$emit("pagePicker:custom", this.SelectGird)
+            }
+          })
+        } else {
+          return this.$u.toast('请选择网格')
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .SelectGird {
+    min-height: 100vh;
+    background: #fff;
+    padding-bottom: 140px;
+    box-sizing: border-box;
+
+    .header-middle {
+      .hint {
+        padding: 28px 20px 28px 32px;
+        line-height: 56px;
+        box-shadow: 0px 1px 0px 0px #e4e5e6;
+        font-size: 30px;
+        font-weight: 500;
+        word-break: break-all;
+      }
+
+      .showTypes {
+        .cards {
+          display: flex;
+          align-items: center;
+          height: 120px;
+          line-height: 120px;
+          // background: pink;
+          padding: 0 0 0 32px;
+
+          .imges {
+            display: flex;
+            align-items: center;
+            // width: 200px;
+            .imgselect {
+              width: 48px;
+              height: 48px;
+              vertical-align: middle;
+            }
+
+            .avatras {
+              width: 74px;
+              height: 74px;
+              border-radius: 8px;
+              margin-left: 36px;
+            }
+          }
+
+          img {
+            width: 74px;
+            height: 74px;
+            border-radius: 8px;
+          }
+
+          .rightes {
+            display: flex;
+            border-bottom: 1px solid #e4e5e6;
+            padding: 0 16px;
+
+            .applicationNames {
+              display: inline-block;
+              font-size: 36px;
+              font-weight: 500;
+              color: #333333;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              vertical-align: bottom;
+            }
+          }
+        }
+      }
+
+    }
+
+    .subBtn {
+      position: fixed;
+      bottom: 0;
+      left: 0;
+      width: 100%;
+      height: 118px;
+      background: #f4f8fb;
+
+      div {
+        width: 192px;
+        height: 80px;
+        line-height: 80px;
+        text-align: center;
+        background: #1365dd;
+        border-radius: 4px;
+        font-size: 32px;
+        color: #fff;
+        margin: 20px 34px 0 0;
+        float: right;
+      }
+    }
+
+  }
+</style>
diff --git a/src/project/saas/AppBuilding/components/img/gird--select-icon.png b/src/project/saas/AppBuilding/components/img/gird--select-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..205144d26b442ba78547c82b8b09585c5b7ac0d7
GIT binary patch
literal 1276
zcmV<Y1OxktP)<h;3K|Lk000e1NJLTq002w?002q|1^@s65zewU00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91OrQe*1ONa40RR91N&o-=0GatRKmY&)W=TXrRCodHoXt<vKor2=bUzSW
zV+4%E4~#KNq6s9PH0nVQ8WR%}@7|1wR}cOX9=sU!;?;v5Jm|s5LGcLDAS6VM9|R<T
ze2Bn8mTtG>n}yQtEYt3k-Lld*$)?@cH`AHlyuRt1PKJS$W*7NMn^`x3^Gh69I{?o}
zD%<=o%QE1jz*x7zlTTW9v7yoiGv^QIJUzW!xX(Dhjpv3VkMof+W^=|K?`=xl!E;lv
zC;}6(W|pkic)S>AK&rMQthcQ@lUD?^q9qB-B3LS1=#<cq1S6rr)_m3=3h6OaGeeig
zZ1icJhH&r%%ZJq3CBaCrGQ?;YtWFw50?5i(eRUupl@JiD&~L@<J*yHlDjl97N3UX|
zkP|Qk7?qfSsmLhg1WW-&B_?1hG75Q8A=eTYY=CDUO!zr%1J}wKPC0=Qa7SALuAfS+
z2E*Zs36-lV7B=$7hVN50*hq^<@UyUkhQ<r<djU@(PE`SB6(X+n+U@ez`s`F>6{rfZ
z$ZA^$HzHt~oj||{m?i;D^{Tv91l{x8u_UA=TOOb1@MY2+EjkY*pf%%l;!7rn-eFfK
z=sr<gj|AA6BS~mXdz;fgY9TOJc4B`5j_>nQoyppD2h3YTxBhgdAV9zrU{qoPrXr(|
z6EFoBl{gZo|KME?KT~<DP>=?{7yTwAr0x^3X}zULfaUVR%{HxI9a+OHa99b5Cq+M{
ztJuma79}^Q_Wz&u7MD8&-ss>S1~*POKq?Wa8mJ&W1cCbhrNY=8hf$n@sz!<hFab(T
za#kZn@<@s|_=Ms0`hS->Ow7BjIMmD_)8Oqt)8g<0XK_{OaEk#=X>YlX?i`jsSyH|u
z-|R6GVAs0R8-_-&23;6ukES*ZjUM%={nUkyB(yhsAv-`m{VKrA0k?cdzS-l(ciU{K
z+c-Y~)9hRVM!+-)XsSoz^q+skutyrq7FN79?fGg!->_FE-sI~oMFMPOHh8p}+=6e6
zVLF3+m?kv>M!+-)XsSoz!*(|^kRl_TmH}ACuR>1BV2G2FY9rQAEaqGtM|UfaQWa}c
zm0RZ<6rqtj33jzhKQyXMZT(9nALh@e>?#2(L*g$WVE%l{t`e{^B>sX(oc{Z7c}PpK
zk^E*qFjj!EId4R;q@D`%Z&eMiMgpv_f(0d?C#3IgHEi@|il#?WlO6#hV44Ip)ycv%
zfw8H@l7LPl^Sw8@b!{65H**Vowpaon$EZ%F#COPiNuAR8)!QgBkGq$5II3F5(4%A}
z>m{^m5<*#LJw~xZO8|zrT`@}u^RPw4D_>{}Yug=9)}eh^yzI(tZ9L7yZNK&z0n<cA
zzzCQo0ZnzXFaoAYKvNwpjAb?R#8{nWF%-k?>nK%3K(I2zUVjy7lM+6RteZAmtI!bE
zH(V3DNQ#XSE6f*LHNi-*DlT)w-PdT-NFP%u+cZ+_9w~N_#2L1S!t{Ld#_Cd$1u}7V
m*c6SI7E%Jx#<%_(-~I#a0*RiV93kWY0000<MNUMnLSTY)zah8)

literal 0
HcmV?d00001

diff --git a/src/project/saas/AppBuilding/components/img/search-icon-w.png b/src/project/saas/AppBuilding/components/img/search-icon-w.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3cb75aff39728022ee3b0f7097c55dc198ea4ef
GIT binary patch
literal 766
zcmV<a0s;MrP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%xJg7oR9HvNmpgA0K@i9Pb5Rm0E|7u*hz2av1c3tHI{_A-01&St1>q$jdJrKU
z6%`O9dPI{ziWIyAd;ui$xLZSksNy&kLP&{}!i9_Yj~4A&wsSt8jT2|PyW5@l&Fs8R
z(B~z6){l+=78Vu;GMS7AAVYGGffteA0E)$8(Vv)@Snt%JL;$|;9|ABfBBucCY@uX@
z<Ocu`J<t1*6eJcPpU;mD4-Y>fc?rNkLZRy-GGD1wZsl^h)ploE0u%~`gCyUOJWwx0
zM3zbB0sOM>_lii4<o>38iz0F^o6Y`=gNOt$%B$6?QL@7xCV<x@?|Yv2ElQy8`$t9O
z9)R;EH0+)=$8mCT5E}rD+lPjRzM4P_g^0*yrPRB2?lj-E)@MjQ58*{*u~MlVYjqtP
z0JPS#B(H?Z2L}gFj*pKg4k~jl2!g`^KGs3ZDW$GP8PEV=qFqG3+km5poK0$ZvvBK)
zxAr>LNgj#Hjs}1x>tDI9dohXITkQ#g;3a?ywq8Vfp$1@zOgf$ZBO;^b0Lg5tfJ+Kx
z1G8Y|t(HoqUCqU+2B5V*PV$qbT~<n^lPZear?oDHDJmi-lv1A?(lvb0T2I>OHLvDf
z*PZMIKoA5k0GL8%%C^ZS^ITgs4+KGQ2f&Q|GUK}L-5vov0x)G|O}Vc7czXi${R;XX
zgqxj)09KZkmUg#HLtDq|%WzK%5y?5v^EQ;@?Ny2+ys);V&By@QDd<bxAhPy9?HE8g
zl}ha!8yj0`+YQ4FJse0vk<XM;H$}t@HVtdjMlxeLfK;8fNQg}vN=HUUZkNmD2LNuw
zK_ni_9mkojR;#DOcHQhsl4b&aUq6<U6s`5sIEX|5p|Wm%Oxi(o1ki1FjD_e{Xs73*
wARNcJwj~}2VIv@}Zz+HQu@L`yf>LVsFG`@mxBbm(Q~&?~07*qoM6N<$f{wyWod5s;

literal 0
HcmV?d00001

diff --git a/src/project/saas/AppBuilding/components/img/xz.png b/src/project/saas/AppBuilding/components/img/xz.png
new file mode 100644
index 0000000000000000000000000000000000000000..98f78cdab2ae85e91b206b3aa327d3557742f637
GIT binary patch
literal 1489
zcmV;?1upuDP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHJ4r-ARA>d&noVdMM;L}@cBNJ^
z<PfNvSjC3~9|8u)v9_d#78*!%DQ)UPa%xY-$Mg@9v(HILe{w86B_{{krX?4*kV1Qi
z>B?~o1|NbirdCoHaxgS%CGGZo=f_^#iltpyyV8Qav%53jJnzmovoqgFihVd%S62_L
zudlxqhT&-;<Z+lBLHdxC@*vG4y@B*oBp=~w8R>h2gM&X04-Y@%^G*(#wD98M;-Olt
zaV`vlbFgt1e*-aX{e%3oQaX3?dH2rP*cb)IK4J^-{j~wddHi`0gqKm9dc%05A>Qm9
z&Ub@AuDGsPLwc=HC{##PtyYK73dKf46dfl#hV<KLsZ%)H`ZpX$UI~ID*FCRDVQnAQ
zK+6KC%$=W~|0oQ_G%^pd03d$>_-%mxI66A|nD^Q}mX?-|K-jymavrwNm~s^<#q`9)
z#J8~BXvbDt0u~k)UTHLfA5f7;qp0M*5V^~x(uv>Nsiak&a{1vKLe#I|<-DftOW$>!
z_r}M^|7=yZr2yZ5cnZe9hatZ86~JFAl}g{WGMwajxm<o9UUdzvdKBg1ez{4{J2AJH
ztvv<6;0Jgs-@rhD?vl^vE+p-2dqG5>>A|5sW8A8W7dC|#b}O1EntrYT1AkLzmN!bJ
zlb^Ngm(dE6q}kuf<p*D&B`&f&M11%>5lsacxA_%i3qm-bdfv&eXejN&_aA&BMDQi*
zt-_t&Z01h81hB)_>y1B92tF@wc;3XvX@f`W^Zog+O-odAIrr6_9ova!X47%BAv}Ga
zZWDc;McTM7hHEioMnX5ru}y#;=haZT!Va63&qslFrpZ7S++X1^PR3}SO#%GEnvWDa
z&82RSHc^OHX|j-s`N&9CTV_)Lrw6zR*Ae%-HO|{glbp#!HZmGkWkw0$*lXrCQ0OY9
zNh;}f8OugiGP6D<fU`=Z53=KW-uUm`21#n4Y-A*>Vb%i7lo<ErOj6_Nl?!jPF3aq2
zF@o!}P!<*nFZ`4qNV1wZ^Cc^p$?k9^g$wlRa4znYI2l4`r8Hy63ElwN9gMA~X%edL
zc4j)g(w3F%=)`IbE4Y$M523S~wpitHjzS|e$7Nt=X45MjVI83hsqqxe(l-JuE7=`f
zsD*hxpYIz1mX+-4L#AEG-8HpN&ne>7<hom|bfFCvXXqoIne1{~R<hHDo)QHY#q5yc
z)ofYGP8UMBPY4E`;+e@VcZBs31cb{(VZ<yuq<A%Nv4+cZp?fTjW<j{GKMu=EcF76R
zlP7=ujf(??!i&XTpAYGf<iBeW@$B&7mtS&Bh<g?{q>fegb}NvPte~7FyZR0=#I3RA
z`QFASoo2MmN&w^Yc(MUyXLO*oH)W8GjAS*;dPT-nKjZTnyKc_CC_=N5)kaNJ3lNo?
z3piC6;%1b%*YI`ZT7};$hE*YM3gFHN!WPrK3lUfCs$b>G_#atx*qsY6F&*8-*%UxV
zvoqo&d8}4bA?|HqyexFU=UuYkwI0P#?~^ggu}uInG`KT@3~(iOXok46J;-1>ZiQ@Q
zj1p}Vzy~_|o0~)uA?@&@4sl0|q?gupt33jS*C%&Irb)6(0B<r54_}*Nn(=vtxY?BY
zy8HiGmkz6|y#f0DRI|MSlI*#N>FX^f`=0xHlh2B1w#~{w>wd*ieShI~^v$dM1}V3|
zXtQtItX2g5viU~0oMA{Z?krZ%D*t;21H}b1%CM^LY;;=@JjeN|fsG#2YPBLDv;C<-
rR0PxfI`-v{J$4G=H5Wx${oLk%)9=4SDWBtd00000NkvXXu0mjfj7GBY

literal 0
HcmV?d00001

diff --git a/src/project/saas/AppBuilding/components/img/xzh.png b/src/project/saas/AppBuilding/components/img/xzh.png
new file mode 100644
index 0000000000000000000000000000000000000000..967fa399ea01a0d7fced8adb1f7a3129aabdeb2c
GIT binary patch
literal 1730
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
YAB0b%2txdb<NyEw07*qoM6N<$f+k!g^8f$<

literal 0
HcmV?d00001

diff --git a/src/project/saas/AppBuilding/components/searchMap.vue b/src/project/saas/AppBuilding/components/searchMap.vue
index 545e909e..aed1d0c1 100644
--- a/src/project/saas/AppBuilding/components/searchMap.vue
+++ b/src/project/saas/AppBuilding/components/searchMap.vue
@@ -1,14 +1,23 @@
 <template>
   <div class="searchMap">
-    <div class="grid-input">
-      <img src="./img/back-icon.png" alt="" class="back-icon" v-if="name && show" @click="show=false">
-      <img src="./img/search-icon.png" alt="" class="search-icon" v-else>
-      <input type="text" class="input" placeholder="请输入姓名、房屋信息" v-model="name" maxlength="10" confirm-type="search"
-             @confirm="search"/>
-      <div class="clear-btn">
-        <img src="./img/del-icon.png" alt="" class="del-icon" v-if="name" @click="clear">
+    <div class="top">
+      <AiPagePicker class="left" type="custom" @select="handleSelectGird"
+                    :ops="{url:'./SelectGird',label: 'girdName'}">
+        <div class="gird-content">
+          <image src="./img/gird--select-icon.png" class="avatras"/>
+          <div class="label">{{ form.girdName || '网格选择' }}</div>
+          <u-icon name="arrow-right" color="#cccccc" size="26" style="margin-left:4px;"></u-icon>
+        </div>
+      </AiPagePicker>
+      <div class="grid-input">
+        <img src="./img/back-icon.png" alt="" class="back-icon" v-if="name && show" @click="show=false">
+        <img src="./img/search-icon-w.png" alt="" class="search-icon" v-else>
+        <input type="text" class="input" placeholder="请输入姓名、房屋信息" v-model="name" maxlength="10" confirm-type="search"
+              @confirm="search"/>
+        <div class="clear-btn">
+          <img src="./img/del-icon.png" alt="" class="del-icon" v-if="name" @click="clear">
+        </div>
       </div>
-      <span class="search-btn" @click="search">搜索</span>
     </div>
     <div class="search-list" v-if="show">
       <div class="title border">
@@ -127,6 +136,7 @@ export default {
       markerArr: [],
       show: false,
       value: '',
+      form: {girdName: '', id: ''},
       ClusterBubble: null,
       name: '',
       buildList: [],
@@ -155,6 +165,10 @@ export default {
     this.$dict.load("communityBuildingType")
   },
   methods: {
+    handleSelectGird(v) {
+      this.form = v || {}
+      // this.getGridList(v?.id, true)
+    },
     getCommunityList() {
       return this.$http.post('/app/appcommunitybuildinginfo/listByBuilding', null, {
         params: {
@@ -365,34 +379,68 @@ export default {
 .searchMap {
   height: 100vh;
 
-  .grid-input {
-    width: calc(100% - 64px);
-    height: 88px;
-    background: #FFF;
-    box-shadow: 0 4px 8px 0 rgba(192, 185, 185, 0.5);
-    border-radius: 16px;
+  * {
+    box-sizing: border-box;
+  }
+
+  .top {
+    display: flex;
     position: fixed;
-    top: 24px;
-    left: 50%;
-    transform: translateX(-50%);
-    z-index: 99999;
-    padding: 16px 20px;
+    align-items: center;
+    justify-content: space-between;
+    top: 0;
+    left: 0;
+    z-index: 1111;
+    width: 100%;
+    height: 112px;
+    padding: 0 32px;
+    background: #FFF;
     box-sizing: border-box;
 
+    .gird-content {
+      display: flex;
+      align-items: center;
+
+      image {
+        width: 32px;
+        height: 34px;
+        margin-right: 16px;
+      }
+
+      .label {
+        max-width: 120px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        color: #666666;
+        font-size: 28px;
+      }
+    }
+
+    .left {
+      flex: 1;
+    }
+  }
+
+  .grid-input {
+    display: flex;
+    align-items: center;
+    width: 460px;
+    height: 64px;
+    background: #F5F5F5;
+    border-radius: 32px;
+    padding: 0 36px;
     .search-icon {
-      width: 48px;
-      height: 48px;
+      width: 32px;
+      height: 32px;
       margin-right: 16px;
     }
 
     .input {
-      display: inline-block;
-      padding: 8px 0;
-      height: 32px;
-      line-height: 32px;
-      width: calc(100% - 220px);
+      flex: 1;
+      height: 64px;
+      width: 100%;
       font-size: 28px;
-      font-family: MicrosoftYaHei;
       color: #666;
     }
 
@@ -404,30 +452,13 @@ export default {
     }
 
     .clear-btn {
-      display: inline-block;
       width: 32px;
       height: 32px;
-      margin-right: 30px;
     }
 
     .del-icon {
       width: 32px;
       height: 32px;
-      vertical-align: super;
-    }
-
-    .search-btn {
-      display: inline-block;
-      width: 80px;
-      height: 32px;
-      line-height: 32px;
-      text-align: right;
-      font-size: 28px;
-      font-family: MicrosoftYaHei;
-      color: #1365DD;
-      border-left: 1px solid #DEDFE0;
-      vertical-align: top;
-      margin-top: 12px;
     }
   }
 
@@ -588,9 +619,8 @@ export default {
   ::v-deep.marker {
     color: #fff;
     background: #5088FF;
-    padding: 0 32px;
     width: fit-content;
-    height: 56px;
+    padding: 10px 32px;
     border-radius: 52px;
     transform: translate(-50%, -50%);
     display: flex;
diff --git a/src/project/saas/AppBuilding/list.vue b/src/project/saas/AppBuilding/list.vue
index 843a8fb0..2773777b 100644
--- a/src/project/saas/AppBuilding/list.vue
+++ b/src/project/saas/AppBuilding/list.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="list">
+  <div class="AppBuildinglist">
     <AiTopFixed>
       <u-search placeholder="小区名称" :show-action="false" v-model="title" @search="current=1,getList()"/>
     </AiTopFixed>
@@ -96,7 +96,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.list {
+.AppBuildinglist {
   padding-bottom: 20px;
   .list-content {
     padding: 32px 32px 0;