小助理

2024-07-15 14:54:31 +08:00
parent fc8720fc40
commit 38f2404ef3
11 changed files with 323 additions and 366 deletions
--- a/src/project/baiduAI/AppRecord/AppRecord.vue
+++ b/src/project/baiduAI/AppRecord/AppRecord.vue
@@ -9,21 +9,16 @@
      </div>
    </div>
    <div class="list-content">
-      <div v-for="(item, index) in messageList" :key="index">
-        <div class="send-time">{{item.createTime.substring(5, 16)}}</div>
-        <div :class="item.userType == 1 ? 'item-left' : 'item-right'">
-          <img src="https://cdn.cunwuyun.cn/wechat/baiduAI/user-img.png" alt="" class="user-img" v-if="item.userType == 1">
-          <div class="item" :class="'item'+index">
-            <u-icon name="play-right-fill" color="#CCE2FF" size="20" v-if="item.userType != 1" class="u-icon-right"></u-icon>
-            <u-icon name="play-left-fill" color="#F3F5F7" size="20" v-if="item.userType == 1" class="u-icon-left"></u-icon>
-            <div class="voice-div" v-if="item.sdkFileUrl" @click="play(item.sdkFileUrl, index)">
-              <span>8”</span>
-              <img src="https://cdn.cunwuyun.cn/wechat/baiduAI/play-d.gif" alt="" v-if="item.isPlay">
-              <img src="https://cdn.cunwuyun.cn/wechat/baiduAI/play-j.png" alt="" v-else>
+      <div class="item" v-for="(item, index) in messageList" :key="index">
+        <p class="item-text">{{item.content}}</p>
+        <div class="time-flex">
+          <p class="time-text">{{item.createTime}}</p>
+          <div class="item-view">
+            <p @click="toDetail(item)">查看对话</p>
+            <div class="del-btn" @click="del(item)">
+              <img src="./img/del-img.png" alt="">
            </div>
-            <p v-if="!item.sdkFileUrl">{{item.content || ''}}</p>
          </div>
-          <img src="https://cdn.cunwuyun.cn/wechat/baiduAI/user-img.png" alt="" class="user-img" v-if="item.userType != 1">
        </div>
      </div>
      <AiEmpty v-if="!messageList.length"/>
@@ -77,7 +72,7 @@ export default {
        return this.$u.toast("请先进行登录")
      }
      this.$loading()
-      this.$instance.post(`/app/appaicopilotinfo/list?current=${this.current}&size=10&content=${this.searchVal}`).then(res => {
+      this.$instance.post(`/app/appaicopilotinfo/listHistory?current=${this.current}&size=10&content=${this.searchVal}`).then(res => {
        if(res.code == 0 && res.data.records.length) {
          res.data.records.map((item) => {
            if(item.sdkFileUrl) {
@@ -110,36 +105,22 @@ export default {
      this.searchVal = ''
      this.getSearchList()
    },
-    play(src, index) {
-      innerAudioContext.stop();
-      if(this.messageList[index].isPlay) {
-        innerAudioContext.onStop(() => {
-          this.messageList[index].isPlay = false
+    toDetail(e) {
+      uni.navigateTo({url: `./Detail?aiConfigId=${e.aiConfigId}`})
+    },
+    del(e) {
+      this.$confirm('确定删除该数据?').then(() => {
+        uni.showLoading()
+        this.$instance.post(`appaicopilotinfo/deleteConversation?conversationId=${e.conversationId}`).then((res) => {
+          if (res.code == 0) {
+            this.$u.toast('删除成功！')
+            this.getSearchList()
+          }
+          uni.hideLoading()
        })
-        return
-      }
-      
-      this.messageList.map((item) => {
-        if(item.sdkFileUrl) {
-          item.isPlay = false
-        }
+      }).catch(() => {
      })
-      this.messageList[index].isPlay = true
-      innerAudioContext.src = src;
-
-      this.$nextTick(() => {
-        innerAudioContext.play();
-      })
-      innerAudioContext.onEnded(() => {
-        this.messageList[index].isPlay = false
-      })
-    },
-    playStop(index) {
-      innerAudioContext.stop();
-      innerAudioContext.onStop(() => {
-        this.messageList[index].isPlay = false
-      })
-    },
+    }
  },
 }
 </script>
@@ -177,79 +158,42 @@ page {
    box-sizing: border-box;
    background-color: #fff;
    padding: 144px 32px 364px;
-    .send-time {
-      display: block;
-      width: 100%;
-      line-height: 28px;
-      font-family: PingFangSC-Regular;
-      font-weight: 400;
-      font-size: 20px;
-      color: #999;
-      text-align: center;
-      margin-bottom: 28px;
-    }
-    .user-img {
-      display: inline-block;
-      width: 72px;
-      height: 72px;
-      vertical-align: top;
-    }
    .item {
-      display: inline-block;
-      max-width: 440px;
-      border-radius: 8px;
-      padding: 18px;
-      box-sizing: border-box;
-      margin-bottom: 28px;
-      position: relative;
-      .voice-div {
-        img {
-          width: 26px;
-          height: 28px;
-        }
-        span {
-          display: inline-block;
-          color: #333;
-          font-size: 28px;
-          font-family: PingFangSC;
-          line-height: 28px;
-          margin-right: 68px;
-        }
-      }
-      p {
-        word-break: break-all;
+      .item-text {
        line-height: 40px;
-        font-family: SourceHanSansCN-Regular;
-        font-size: 32px;
+        font-family: PingFangSC-Regular;
+        font-size: 28px;
        color: #333;
-      }
-    }
-    .item-right {
-      display: flex;
-      justify-content: flex-end;
-      .item {
+        padding: 18px;
        background-color: #CCE2FF;
+        border-radius: 8px;
      }
-      .user-img {
-        margin-left: 24px;
-      }
-      .u-icon-right {
-        position: absolute;
-        top: 12px;
-        right: -12px;
-      }
-    }
-    .item-left {
-      .item {
-        background-color: #F3F5F7;
-      }
-      .user-img {
-        margin-right: 24px;
-      }
-      .u-icon-left {
-        position: absolute;
-        top: 12px;
-        left: -12px;
+      .time-flex {
+        display: flex;
+        justify-content: space-between;
+        line-height: 40px;
+        font-family: PingFangSC-Regular;
+        font-size: 24px;
+        .time-text {
+          color: #999;
+          padding-top: 34px;
+        }
+        .item-view {
+          p {
+            display: inline-block;
+            font-size: 28px;
+            color: #216AFD;
+          }
+          div {
+            display: inline-block;
+            padding: 34px 0 34px 38px;
+            img {
+              width: 40px;
+              height: 40px;
+              vertical-align: bottom;
+            }
+          }
+        }
      }
    }
  }
--- a/src/project/baiduAI/AppRecord2/Detail.vue
+++ b/src/project/baiduAI/AppRecord2/Detail.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="Detail">
-    <u-navbar title="Copilot小助理" title-color="#000" title-width="300" title-size="32" :title-bold="true" :background="backgroundNavbar" :is-back="false" :height="44"></u-navbar>
+    <u-navbar title="Copilot小助理" title-color="#000" title-width="300" title-size="32" :title-bold="true" :background="backgroundNavbar" :height="44"></u-navbar>
    <div class="list-bg">
      <div class="search-content">
        <u-search v-model="searchVal" :clearabled="true" placeholder="请输入搜索关键词…" :show-action="false"
@@ -54,12 +54,14 @@ export default {
      ],
      current: 1,
      pages: 2,
+      aiConfigId: ''
    }
  },
  computed: {
    ...mapState(['user', 'token']),
  },
-  onShow() {
+  onLoad(e) {
+    this.aiConfigId = e.aiConfigId
    this.getHistoryList()
  },
  onPullDownRefresh() {
@@ -76,7 +78,7 @@ export default {
        return this.$u.toast("请先进行登录")
      }
      this.$loading()
-      this.$instance.post(`/app/appaicopilotinfo/list?current=${this.current}&size=10&content=${this.searchVal}`).then(res => {
+      this.$instance.post(`/app/appaicopilotinfo/list?current=${this.current}&size=10&content=${this.searchVal}&aiConfigId=${this.aiConfigId}`).then(res => {
        if(res.code == 0 && res.data.records.length) {
          res.data.records.map((item) => {
            if(item.sdkFileUrl) {
--- a/src/project/baiduAI/AppRecord2/img/del-img.png
+++ b/src/project/baiduAI/AppRecord2/img/del-img.png
--- a/src/project/baiduAI/AppRecord2/AppRecord.vue
+++ b/src/project/baiduAI/AppRecord2/AppRecord.vue
@@ -1,201 +0,0 @@
-<template>
-  <div class="AppRecord">
-    <u-navbar title="Copilot小助理" title-color="#000" title-width="300" title-size="32" :title-bold="true" :background="backgroundNavbar" :is-back="false" :height="44"></u-navbar>
-    <div class="list-bg">
-      <div class="search-content">
-        <u-search v-model="searchVal" :clearabled="true" placeholder="请输入搜索关键词…" :show-action="false"
-          bg-color="#fff" search-icon-color="#E2E8F1" color="#666" height="72" @search="getSearchList" @clear="handerClear">
-        </u-search>
-      </div>
-    </div>
-    <div class="list-content">
-      <div class="item" v-for="(item, index) in messageList" :key="index">
-        <p class="item-text">{{item.content}}</p>
-        <div class="time-flex">
-          <p class="time-text">{{item.createTime}}</p>
-          <div class="item-view">
-            <p @click="toDetail(item)">查看对话</p>
-            <div class="del-btn" @click="del(item)">
-              <img src="./img/del-img.png" alt="">
-            </div>
-          </div>
-        </div>
-      </div>
-      <AiEmpty v-if="!messageList.length"/>
-    </div>
-  </div>
-</template>
-
-<script>
-
-import {mapActions, mapState} from "vuex";
-export default {
-  customNavigation: true,
-  enablePullDownRefresh: true,
-  name: 'AppRecord',
-  appName: 'Copilot小助理(记录)',
-  data() {
-    return {
-      backgroundNavbar: {
-        background: 'url(https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/header-bg.jpeg) no-repeat',
-        backgroundSize: 'cover',
-      },
-      searchVal: '',
-      messageList: [
-        // {
-        //   userType: 0,
-        //   sdkFileUrl: 'http://test87ftp.cunwuyun.cn/20240104/output.mp3',
-        //   isPlay: false
-        // }
-      ],
-      current: 1,
-      pages: 2,
-    }
-  },
-  computed: {
-    ...mapState(['user', 'token']),
-  },
-  onShow() {
-    this.getHistoryList()
-  },
-  onPullDownRefresh() {
-    if(this.current > this.pages) {
-      return this.$u.toast('没有更多记录')
-    }
-    this.current = this.current + 1
-    this.getHistoryList()
-  },
-  methods: {
-    ...mapActions(['autoLogin']),
-    getHistoryList() {
-      if(!this.token) {
-        return this.$u.toast("请先进行登录")
-      }
-      this.$loading()
-      this.$instance.post(`/app/appaicopilotinfo/listHistory?current=${this.current}&size=10&content=${this.searchVal}`).then(res => {
-        if(res.code == 0 && res.data.records.length) {
-          res.data.records.map((item) => {
-            if(item.sdkFileUrl) {
-              item.isPlay = false
-            }
-          })
-          this.messageList = this.current == 1 ? res.data.records : [...res.data.records, ...this.messageList]
-          var idPage = res.data.records.length-1
-          this.$nextTick(() => {  
-            uni.pageScrollTo({
-              duration: 300,
-              selector: this.current == 1 ? `.item${this.messageList.length-1}` :  `.item${idPage}`
-            });
-          })
-          this.pages = res.data.pages
-          this.$hideLoading()
-        }else {
-          if(this.current == 1) {
-            this.messageList = []
-          }
-          
-        }
-      })
-    },
-    getSearchList() {
-      this.current = 1
-      this.getHistoryList()
-    },
-    handerClear() {
-      this.searchVal = ''
-      this.getSearchList()
-    },
-    toDetail(e) {
-      uni.navigateTo({url: `./Detail`})
-    },
-    del(e) {
-      this.$confirm('确定删除该数据?').then(() => {
-        uni.showLoading()
-        this.$instance.post(`/app/appresident/delete?ids=${e.id}`).then((res) => {
-          if (res.code == 0) {
-            this.$u.toast('删除成功！')
-            this.getSearchList()
-          }
-          uni.hideLoading()
-        })
-      }).catch(() => {
-      })
-    }
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-@import "~dvcp-wui/common";
-page {
-  height: 100%;
-}
-.AppRecord {
-  height: 100vh;
-  background-color: #fff;
-  position: relative;
-  .list-bg {
-    width: 100%;
-    height: 420px;
-    background-image: url("https://cdn.cunwuyun.cn/wechat/biaopin/residentAssistant/content-top-bg.png");
-    position: fixed;
-    left: 0;
-    z-index: 1;
-    background-size: 100vw;
-    background-repeat: no-repeat;
-    .search-content {
-      padding: 32px;
-      width: 100%;
-      box-sizing: border-box;
-      position: fixed;
-      left: 0;
-      z-index: 99;
-      background: linear-gradient(to bottom, #D7EDFE, #EAF5FE);
-    }
-  }
-  .list-content {
-    width: 100%;
-    box-sizing: border-box;
-    background-color: #fff;
-    padding: 144px 32px 364px;
-    .item {
-      .item-text {
-        line-height: 40px;
-        font-family: PingFangSC-Regular;
-        font-size: 28px;
-        color: #333;
-        padding: 18px;
-        background-color: #CCE2FF;
-        border-radius: 8px;
-      }
-      .time-flex {
-        display: flex;
-        justify-content: space-between;
-        line-height: 40px;
-        font-family: PingFangSC-Regular;
-        font-size: 24px;
-        .time-text {
-          color: #999;
-          padding-top: 34px;
-        }
-        .item-view {
-          p {
-            display: inline-block;
-            font-size: 28px;
-            color: #216AFD;
-          }
-          div {
-            display: inline-block;
-            padding: 34px 0 34px 38px;
-            img {
-              width: 40px;
-              height: 40px;
-              vertical-align: bottom;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-</style>
--- a/src/project/baiduAI/AppRecord2/record.png
+++ b/src/project/baiduAI/AppRecord2/record.png
--- a/src/project/baiduAI/AppRecord2/record_selected.png
+++ b/src/project/baiduAI/AppRecord2/record_selected.png
--- a/src/project/weiyang/AppPageInteraction/AppPageInteraction.vue
+++ b/src/project/weiyang/AppPageInteraction/AppPageInteraction.vue
@@ -1,5 +1,10 @@
 <template>
  <div class="AppPageInteraction">
+    <u-navbar back-icon-color="#000" title="居民管理" title-color="#000" title-width="300" title-size="32" 
+        :title-bold="true" :background="backgroundNavbar" :is-fixed="true" height="44"></u-navbar>
+    <div class="header-content-bg">
+      <img src="https://cdn.sinoecare.com/i/2024/07/12/6690a1303d423.png" alt="">
+    </div>
    <AiListPage :label="label" :appList="appList" :headerBg="headerBg"/>
  </div>
 </template>
@@ -8,6 +13,7 @@
 export default {
  name: 'AppPageInteraction',
  appName: '居民管理',
+  customNavigation: true,
  data() {
    return {
      label: '居民管理',
@@ -29,10 +35,18 @@ export default {
        // }
      ],
      headerBg: 'https://cdn.sinoecare.com/i/2024/07/10/668ddacfbac60.png',
+      backgroundNavbar: {
+        background: 'url(https://cdn.sinoecare.com/i/2024/07/12/6690a1309c7d3.png) no-repeat',
+        backgroundSize: 'cover',
+      },
    }
  },
  onShow() {
-  }
+    uni.setNavigationBarColor({
+      frontColor: 'black',
+      backgroundColor: '#ffffff'
+    })
+  },
 }
 </script>

@@ -43,5 +57,15 @@ uni-page-body {

 .AppPageInteraction {
  height: 100%;
+  .header-content-bg {
+    width: 100%;
+    position: relative;
+    img {
+      width: 100%;
+      height: 592px;
+      position: absolute;
+      z-index: -1;
+    }
+  }
 }
 </style>
--- a/src/project/weiyang/AppPeopleList/AppPeopleList.vue
+++ b/src/project/weiyang/AppPeopleList/AppPeopleList.vue
@@ -1,5 +1,10 @@
 <template>
  <div class="AppPeopleList">
+    <u-navbar back-icon-color="#000" title="居民管理" title-color="#000" title-width="300" title-size="32" 
+        :title-bold="true" :background="backgroundNavbar" :is-fixed="true" height="44"></u-navbar>
+    <div class="header-content-bg">
+      <img src="https://cdn.sinoecare.com/i/2024/07/12/6690a1303d423.png" alt="">
+    </div>
    <div class="banner" v-for="(item, index) in bannerList" :key="index" @click="linkTo(item.linkUrl)">
      <img :src="item.img" alt="">
      <p>{{item.title}}</p>
@@ -11,6 +16,7 @@
 export default {
  name: 'AppPeopleList',
  appName: '居民档案',
+  customNavigation: true,
  data() {
    return {
      bannerList: [
@@ -24,11 +30,18 @@ export default {
          title: '居民档案审核',
          linkUrl: './ExamineList'
        }
-      ]
+      ],
+      backgroundNavbar: {
+        background: 'url(https://cdn.sinoecare.com/i/2024/07/12/6690a1309c7d3.png) no-repeat',
+        backgroundSize: 'cover',
+      },
    }
  },
  onShow() {
-    document.title = '居民档案'
+    uni.setNavigationBarColor({
+      frontColor: 'black',
+      backgroundColor: '#ffffff'
+    })
  },
  methods: {
    linkTo(url) {
@@ -41,7 +54,17 @@ export default {
 <style lang="scss" scoped>
 .AppPeopleList{
  height: 100%;
-  padding-top: 16px;
+  // padding-top: 16px;
+  .header-content-bg {
+    width: 100%;
+    position: relative;
+    img {
+      width: 100%;
+      height: 592px;
+      position: absolute;
+      z-index: -1;
+    }
+  }
  .banner{
    padding: 32px 40px 0;
    position: relative;
--- a/src/project/weiyang/AppPeopleList/DetailPeople.vue
+++ b/src/project/weiyang/AppPeopleList/DetailPeople.vue
@@ -1,6 +1,10 @@
 <template>
  <div class="DetailPeople" v-if="data.resident">
-
+    <u-navbar back-icon-color="#000" title="居民管理" title-color="#000" title-width="300" title-size="32" 
+        :title-bold="true" :background="backgroundNavbar" :is-fixed="true" height="44"></u-navbar>
+    <div class="header-content-bg">
+      <img src="https://cdn.sinoecare.com/i/2024/07/12/6690a1303d423.png" alt="">
+    </div>
    <div class="top">
      <div class="photos">
        <img :src="data.resident.photo" alt="" v-if="data.resident && data.resident.photo" />
@@ -156,8 +160,8 @@
 <script>
 export default {
  name: 'DetailPeople',
-  components: {},
-  props: {},
+  appName: '居民档案',
+  customNavigation: true,
  data() {
    return {
      id: '',
@@ -165,6 +169,10 @@ export default {
      type: 0, //0查看详情  1审核详情
      tabList:[],
      tabIndex: 0,
+      backgroundNavbar: {
+        background: 'url(https://cdn.sinoecare.com/i/2024/07/12/6690a1309c7d3.png) no-repeat',
+        backgroundSize: 'cover',
+      },
    }
  },
  computed: {},
@@ -180,7 +188,10 @@ export default {
    })
  },
  onShow() {
-    document.title = '家庭成员信息'
+    uni.setNavigationBarColor({
+      frontColor: 'black',
+      backgroundColor: '#ffffff'
+    })
  },
  methods: {
    getDetail() {
@@ -233,6 +244,16 @@ export default {
 .DetailPeople {
  height: 100%;
  background: #fff;
+  .header-content-bg {
+    width: 100%;
+    position: relative;
+    img {
+      width: 100%;
+      height: 592px;
+      position: absolute;
+      z-index: -1;
+    }
+  }
  .top {
    display: flex;
    padding: 48px 32px 32px 32px;
--- a/src/project/weiyang/AppPeopleList/PeopleList.vue
+++ b/src/project/weiyang/AppPeopleList/PeopleList.vue
@@ -1,11 +1,12 @@
 <template>
  <div class="PeopleList">
-    <AiTopFixed>
+    <u-navbar back-icon-color="#000" title="居民管理" title-color="#000" title-width="300" title-size="32" 
+        :title-bold="true" :background="backgroundNavbar" :is-fixed="true" height="44"></u-navbar>
+    <div class="header-content-bg">
+      <img src="https://cdn.sinoecare.com/i/2024/07/12/6690a1303d423.png" alt="">
+    </div>
+    <!-- <AiTopFixed>
      <div class="areatop">
-        <!-- <div>区域选择</div>
-        <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"></AiAreaPicker>
-        <u-icon name="photo"></u-icon> -->
-        <!-- @select="areaSelect" -->
        <u-form label-width="auto">
          <u-form-item label="区域选择" right-icon="arrow-right" class="areaIds">
            <AiAreaPicker v-model="areaId" :areaId="user.areaId" @input="seachObj" :name.sync="areaName" selectRoot/>
@@ -22,7 +23,33 @@
                  bg-color="#F5F5F5" search-icon-color="#E2E8F1" color="#666" height="58" @search="handerSearch"
                  @clear="handerClear"></u-search>
      </div>
-    </AiTopFixed>
+    </AiTopFixed> -->
+
+    <div class="top-tabs">
+      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#fff" inactive-color="#222"
+        active-color="#1D2229" :bar-style="barStyle"  font-size="34" @change="change"></u-tabs>
+      <div class="select-content">
+        <!-- <div class="search-input">
+          <img src="./img/search-icon.png" alt=""/>
+          <u-input type="text" placeholder="请输入姓名" placeholder-style="color:#999;font-size:13px;" height="18"
+            v-model="search.name" @confirm="getUserList" :clearable="false" maxlength="6"/>
+        </div> -->
+        <div class="search-input">
+          <u-search placeholder="姓名/联系方式/身份证后6位" :clearabled="true" v-model="keyword" :show-action="false" bg-color="#F4F5FA" search-icon-color="#F4F5FA" 
+            color="#666" height="72" @search="handerSearch"  @clear="handerClear"></u-search>
+        </div>
+        <div class="area-content fill">
+          <AiPagePicker type="gird" @select="seachObj">
+            <AiMore v-model="gridName" placeholder="选择地区"/>
+          </AiPagePicker>
+          <!-- <AiAreaPicker v-model="areaId" :areaId="user.areaId" @input="seachObj" :name.sync="areaName" selectRoot>
+            <AiMore v-model="areaName" placeholder="选择网格"/>
+          </AiAreaPicker> -->
+        </div>
+      </div>
+    </div>
+
+
    <div class="dataes" v-if="datas.length > 0">
      <div class="datass" v-for="(item, iindex) in datas" :key="iindex" @click="toDetailCard(item)">
        <div class="left">
@@ -52,7 +79,9 @@
    </div>
    <!-- <AiEmpty class="emptyWrap" v-else></AiEmpty> -->
    <div style="height: 60px"></div>
-    <div class="addBtn" @click="edit('')">新增居民</div>
+    <div class="footer" @click="edit('')">
+      <div class="btn">新增居民</div>
+    </div>
  </div>
 </template>

@@ -61,7 +90,8 @@ import {mapState} from 'vuex'

 export default {
  name: 'PeopleList',
-  props: {},
+  appName: '查看居民档案',
+  customNavigation: true,
  data() {
    return {
      keyword: '',
@@ -82,6 +112,17 @@ export default {
      currentTabs: 0,
      areaId: '',
      areaName: '',
+      backgroundNavbar: {
+        background: 'url(https://cdn.sinoecare.com/i/2024/07/12/6690a1309c7d3.png) no-repeat',
+        backgroundSize: 'cover',
+      },
+      barStyle: {
+        'width': '20px',
+        'height': '4px',
+        'border-radius': '3px',
+        'bottom': '-4px',
+        'background': '#026AF2'
+      },
    }
  },
  computed: {
@@ -98,7 +139,10 @@ export default {
    this.getList()
  },
  onShow() {
-    document.title = '查看居民档案'
+    uni.setNavigationBarColor({
+      frontColor: 'black',
+      backgroundColor: '#ffffff'
+    })
  },
  methods: {
    getList() {
@@ -180,7 +224,56 @@ export default {
 <style scoped lang="scss">
 .PeopleList {
  height: 100%;
+  .header-content-bg {
+    width: 100%;
+    position: relative;
+    img {
+      width: 100%;
+      height: 592px;
+      position: absolute;
+      z-index: -1;
+    }
+  }
+  .top-tabs {
+    width: 100%;
+    padding: 0 32px;
+    box-sizing: border-box;
+    position: fixed;
+    z-index: 9;
+    ::v-deep .u-tabs {
+      border-top-left-radius: 16px;
+      border-top-right-radius: 16px;
+      border-bottom: 1px solid #eee;
+    }
+    .select-content {
+      width: 100%;
+      padding: 0 32px;
+      box-sizing: border-box;
+      background-color: #fff;
+      .search-input {
+        width: 100%;
+        padding: 28px 0;
+      }
+      .area-content {
+        width: 100%;
+        padding: 26px 32px;
+        box-sizing: border-box;
+        font-family: PingFangSC-Regular;
+        font-size: 32px;
+        color: #222;
+        ::v-deep u-icon, 
+        ::v-deep .u-icon {
+          width: 100%;
+        }
+        ::v-deep .u-icon__label {
+          display: inline-block;
+          width: calc(100% - 32px);
+        }
+      }

+      
+    }
+  }
  .areatop {
    display: flex;
    justify-content: space-between;
@@ -234,7 +327,9 @@ export default {

  .dataes {
    background: #fff;
-
+    width: calc(100% - 64px);
+    margin-left: 32px;
+    padding-top: 320px;
    .datass {
      display: flex;
      padding: 24px 32px;
@@ -283,16 +378,26 @@ export default {
    margin: 0;
  }

-  .addBtn {
+
+  .footer {
    width: 100%;
-    height: 112px;
-    line-height: 112px;
-    background: #1365DD;
-    text-align: center;
-    color: #FFF;
-    font-size: 32px;
    position: fixed;
    bottom: 0;
+    left: 0;
+    background-color: #F4F5FA;
+    padding: 64px 64px 68px 64px;
+    z-index: 9;
+    .btn {
+      width: calc(100% - 128px);
+      line-height: 88px;
+      background: #026AF2;
+      border-radius: 44px;
+      font-family: PingFangSC-Medium;
+      font-weight: 500;
+      font-size: 34px;
+      color: #FFF;
+      text-align: center;
+    }
  }

  .empty {
--- a/src/project/weiyang/AppSpecialPeople/AppSpecialPeople.vue
+++ b/src/project/weiyang/AppSpecialPeople/AppSpecialPeople.vue
@@ -2,12 +2,12 @@
  <div class="AppSpecialPeople">
    <template v-if="hasGridPermit">
      <u-navbar back-icon-color="#000" title="特殊人群" title-color="#000" title-width="300" title-size="32" 
-        :title-bold="true" :background="backgroundNavbar" :is-fixed="true" height="44"></u-navbar>
+        :title-bold="true" :background="backgroundNavbar" :is-fixed="true" height="44" z-index="999"></u-navbar>
      <div class="header-content-bg">
        <img src="https://cdn.sinoecare.com/i/2024/07/12/6690a1303d423.png" alt="">
      </div>
-      <div class="top-tabs">
-        <u-tabs :list="tabs" :is-scroll="false" :current="tabIndex" height="96" bg-color="#fff" inactive-color="#222"
+      <div :class="!tabIndex ? 'top-tabs border-r' : 'top-tabs'" :style="{'top': `${statusBarHeight+50}px`}">
+        <u-tabs :list="tabs" :is-scroll="false" :current="tabIndex" height="96" inactive-color="#222"
          active-color="#1D2229" :bar-style="barStyle"  font-size="34" @change="tabClick"></u-tabs>
        <div class="select-content">
          <!-- <div class="search-input">
@@ -16,7 +16,7 @@
              v-model="search.name" @confirm="getUserList" :clearable="false" maxlength="6"/>
          </div> -->
          <div class="search-input" v-if="tabIndex">
-            <u-search placeholder="请输入姓名" v-model="search.name" :show-action="false" bg-color="#F4F5FA" search-icon-color="#F4F5FA" 
+            <u-search placeholder="请输入姓名" v-model="search.name" :show-action="false" bg-color="#F4F5FA" search-icon-color="#666" 
              color="#666" height="72" @search="(page1.current = 1), getList()" ></u-search>
          </div>
          <div class="area-content fill">
@@ -30,7 +30,7 @@
        <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index"
             @click="tabClick(index)">{{ item }}<span></span></div>
      </div> -->
-      <div v-if="!tabIndex">
+      <div v-if="!tabIndex" class="statistic-content">
        <div class="info-content">
          <div class="title">特殊人群</div>
          <div class="num-content">
@@ -52,7 +52,7 @@
          </div>
        </div>
      </div>
-      <div v-else>
+      <div v-else class="list-content">
        <div class="item-content" v-for="(item, index) in userList" :key="index">
          <div class="title" @click="showUserType(index)">
            <h2>{{ item.label }}</h2>
@@ -106,7 +106,6 @@ export default {
          name: "人员信息",
        },
      ],
-      // tabs: ['统计信息', '人员信息'],
      tabIndex: 0,
      addressArea: '',
      statisticsList: [],
@@ -125,6 +124,7 @@ export default {
        'bottom': '-4px',
        'background': '#026AF2'
      },
+      statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
    }
  },
  computed: {
@@ -268,27 +268,32 @@ export default {
      z-index: -1;
    }
  }
+
+  .top-fixed {
+    width: 100%;
+    position: fixed;
+    left: 32px;
+    z-index: 999;
+  }
+  
  .top-tabs {
-    padding: 32px;
+    width: calc(100% - 64px);
    box-sizing: border-box;
-    ::v-deep .u-tabs {
-      border-top-left-radius: 16px;
-      border-top-right-radius: 16px;
-    }
+    position: fixed;
+    left: 32px;
+
    .select-content {
      width: 100%;
      padding: 0 32px;
      box-sizing: border-box;
      background-color: #fff;
-      border-bottom-left-radius: 16px;
-      border-bottom-right-radius: 16px;
      .search-input {
        width: 100%;
        padding: 28px 0;
      }
      .area-content {
        width: 100%;
-        padding: 26px 32px;
+        padding: 26px 0;
        box-sizing: border-box;
        font-family: PingFangSC-Regular;
        font-size: 32px;
@@ -307,10 +312,27 @@ export default {
    }
  }

+  ::v-deep .u-tabs {
+    border-bottom: 1px solid #eee;
+    border-top-left-radius: 16px;
+    border-top-right-radius: 16px;
+  }
+
+  .border-r {
+    .select-content {
+      border-bottom-left-radius: 16px;
+      border-bottom-right-radius: 16px;
+    }
+  }
+
+  .statistic-content {
+    padding: 216px 0 32px 0;
+  }
+
  .info-content {
    width: calc(100% - 64px);
    background: #fff;
-    border-radius: 8px;
+    border-radius: 32px;
    margin: 24px 32px 0;

    .title {
@@ -360,8 +382,21 @@ export default {
    }
  }

+  .list-content {
+    width: calc(100% - 64px);
+    // padding: 32px 0;
+    margin: 320px 0 188px 32px;
+    height: calc(100% - 640px);
+    padding-bottom: 32px;
+    box-sizing: border-box;
+    background-color: #fff;
+    border-bottom-left-radius: 16px;
+    border-bottom-right-radius: 16px;
+  }
+
  .item-content {
    margin-bottom: 4px;
+    border-bottom: 1px solid #eee;

    .title {
      width: 100%;
@@ -458,18 +493,22 @@ export default {
    position: fixed;
    bottom: 0;
    left: 0;
+    background-color: #F4F5FA;
+    padding: 32px 64px 68px 64px;
+    z-index: 9;
+    .btn {
+      width: calc(100% - 128px);
+      line-height: 88px;
+      background: #026AF2;
+      border-radius: 44px;
+      font-family: PingFangSC-Medium;
+      font-weight: 500;
+      font-size: 34px;
+      color: #FFF;
+      text-align: center;
+    }
  }

-  .btn {
-    width: 100%;
-    height: 112px;
-    line-height: 112px;
-    text-align: center;
-    background: #1365dd;
-    font-size: 32px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-    color: #fff;
-  }
+
 }
 </style>