From f424d67650db106160f0b7d3ef2878bdcc3c7d2b 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: Thu, 23 Dec 2021 14:29:45 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=A1=A3=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppResidentDocument.vue                   | 139 +++++++++++
 src/apps/AppResidentDocument/DetailCard.vue   | 193 ++++++++++++++++
 src/apps/AppResidentDocument/DetailPeople.vue | 215 ++++++++++++++++++
 .../AppResidentDocument/components/img/2.png  | Bin 0 -> 888 bytes
 src/apps/AppResidentFile/AppResidentFile.vue  |   2 +-
 5 files changed, 548 insertions(+), 1 deletion(-)
 create mode 100644 src/apps/AppResidentDocument/AppResidentDocument.vue
 create mode 100644 src/apps/AppResidentDocument/DetailCard.vue
 create mode 100644 src/apps/AppResidentDocument/DetailPeople.vue
 create mode 100644 src/apps/AppResidentDocument/components/img/2.png

diff --git a/src/apps/AppResidentDocument/AppResidentDocument.vue b/src/apps/AppResidentDocument/AppResidentDocument.vue
new file mode 100644
index 00000000..40d872f1
--- /dev/null
+++ b/src/apps/AppResidentDocument/AppResidentDocument.vue
@@ -0,0 +1,139 @@
+<template>
+  <div class="AppResidentDocument">
+    <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
+
+    <AiAreaPicker v-model="areaId" all :areaId="areaId" @select="areaSelect"></AiAreaPicker>
+
+    <div class="line"></div>
+
+    <div class="seachObj">
+      <u-search v-model="keyword" :clearabled="true" placeholder="搜索" :show-action="false" bg-color="#F5F5F5" search-icon-color="#E2E8F1" color="#666" height="58" @search="handerSearch" @clear="handerClear"></u-search>
+    </div>
+
+    <div class="datas" v-if="datas.length > 0">
+      <div class="datass" v-for="(item, iindex) in datas" :key="iindex" @click="toDetailCard(item)">
+        <!-- <div class="left">
+          <img :src="item.photo" alt="" v-if="item.photo" />
+          <img src="./components/img/4.png" alt="" v-else />
+        </div>
+
+        <div class="right">
+          <div class="rightTop">{{ item.name }}</div>
+          <div class="rightBottom">
+            <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}</span>
+
+            <span>{{ item.phone }}</span>
+          </div>
+        </div> -->
+      </div>
+    </div>
+
+    <AiEmpty v-else></AiEmpty>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AppResidentDocument',
+  appName: '居民档案',
+  components: {},
+  props: {},
+  data() {
+    return {
+      datas: [],
+      current: 1,
+      size: 10,
+      tabList: [
+        {
+          name: '本地居民',
+        },
+        {
+          name: '流动人员',
+        },
+      ],
+      currentTabs: 0,
+    }
+  },
+  computed: {},
+  watch: {},
+  onLoad() {},
+  onShow() {},
+  methods: {
+    getList() {
+      this.$http
+        .post('/app/wxcp/wxcustomer/list', null, {
+          params: {
+            size: this.size,
+            current: this.current,
+            // createUserId: this.currentTabs == 1 ? this.user.id : '',
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+
+            this.pages = res.data.pages
+          }
+        })
+    },
+
+    change(index) {
+      this.currentTabs = index
+      this.getList()
+    },
+
+    toDetailCard(item) {
+      uni.navigateTo({ url: `./DetailCard?id=${item.id}` })
+    },
+  },
+  onReachBottom() {
+    this.current = this.current + 1
+    this.getList()
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.AppResidentDocument {
+  height: 100%;
+  background: #fff;
+  .line {
+    height: 16px;
+    background: #f5f5f5;
+  }
+  .seachObj {
+    border-bottom: 2px solid #f5f5f5;
+    border-top: 2px solid #f5f5f5;
+    padding: 20px 32px;
+  }
+  .datas {
+    .datass {
+      display: flex;
+      padding: 24px 32px;
+      .left {
+        img {
+          width: 80px;
+          height: 80px;
+          border-radius: 50%;
+        }
+      }
+      .right {
+        display: flex;
+        flex-direction: column;
+        margin-left: 32px;
+        width: 100%;
+        .rightTop {
+          font-size: 32px;
+          font-weight: 500;
+          color: #333333;
+        }
+        .rightBottom {
+          display: flex;
+          justify-content: space-between;
+          margin-top: 8px;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/apps/AppResidentDocument/DetailCard.vue b/src/apps/AppResidentDocument/DetailCard.vue
new file mode 100644
index 00000000..4e7ae0fa
--- /dev/null
+++ b/src/apps/AppResidentDocument/DetailCard.vue
@@ -0,0 +1,193 @@
+<template>
+  <div class="DetailCard">
+    <div class="top"></div>
+
+    <div class="middle">
+      <div class="hint">家庭地址</div>
+
+      <div class="areaHint">
+        <u-icon name="map-fill" color="#73ABFF"></u-icon>
+        <span>{{ currentAreaName }}</span>
+      </div>
+    </div>
+
+    <div class="bottom">
+      <div class="hints">家庭成员</div>
+
+      <div v-if="data.family && data.family.length > 0">
+        <div class="card" v-for="(item, i) in data.family" :key="i" @click="toDetailPeople(item)">
+          <div class="photos">
+            <img :src="item.photo" alt="" v-if="item.photo" />
+            <img src="./components/img/2.png" alt="" v-else />
+          </div>
+
+          <div class="right">
+            <div class="rightTop">
+              <div class="rightTop-lefts">
+                <span class="names">{{ item.name }}</span>
+                <span class="householdNames" v-if="item.householdName == 1">户主</span>
+                <span class="householdNames" v-else>
+                  {{ $dict.getLabel('householdRelation', item.householdName) }}
+                </span>
+              </div>
+
+              <div class="rightTop-rights">
+                <u-section :show-line="false" sub-title="详情"></u-section>
+              </div>
+            </div>
+
+            <div class="rightBottom">
+              <span>身份证号：</span>
+              <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <AiEmpty v-else></AiEmpty>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DetailCard',
+  components: {},
+  props: {},
+  data() {
+    return {
+      id: '',
+      data: [],
+      currentAreaName: '',
+    }
+  },
+  computed: {},
+  watch: {},
+  onLoad(o) {
+    this.id = o.id
+    this.$dict.load('householdRelation').then(() => {
+      this.getDetail()
+    })
+  },
+  onShow() {},
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/appresident/detail?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.data = res.data
+          this.$nextTick(() => {
+            this.currentAreaName = res.data.resident.currentAreaName
+          })
+        }
+      })
+    },
+
+    toDetailPeople(item) {
+      uni.navigateTo({ url: `./DetailPeople?id=${item.id}` })
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.DetailCard {
+  height: 100%;
+  .top {
+    height: 112px;
+    background: #3975c6;
+  }
+
+  .middle {
+    margin: -80px 32px 0 32px;
+    padding: 38px 30px 78px 28px;
+    background: #ffffff;
+    box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.02);
+    border-radius: 16px;
+    z-index: 999;
+    .hint {
+      font-size: 32px;
+      font-weight: 500;
+      color: #333333;
+    }
+    .areaHint {
+      margin-top: 38px;
+      span {
+        margin-left: 14px;
+      }
+    }
+  }
+
+  .bottom {
+    margin: 32px 30px 48px 30px;
+    background: #fff;
+    padding: 38px 30px 30px 30px;
+    .hints {
+      margin-bottom: 38px;
+    }
+    .card {
+      display: flex;
+      box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.08);
+      border-radius: 16px;
+      padding: 48px 32px;
+      margin-bottom: 32px;
+      .photos {
+        img {
+          width: 96px;
+          height: 96px;
+          border-radius: 50%;
+        }
+      }
+
+      .right {
+        display: flex;
+        flex-direction: column;
+        margin-left: 40px;
+        width: 100%;
+        .rightTop {
+          display: flex;
+          justify-content: space-between;
+          .rightTop-lefts {
+            .names {
+              font-size: 32px;
+              font-weight: 600;
+            }
+            .householdNames {
+              margin-left: 30px;
+              font-size: 26px;
+              font-weight: 500;
+              color: #5aad6a;
+            }
+          }
+          .rightTop-rights {
+            ::v-deep .u-section {
+              .u-section__right-info {
+                color: #3975c6 !important;
+                .u-section__right-info__icon-arrow {
+                  .u-icon {
+                    .u-icon__icon {
+                      color: #3975c6 !important;
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+        .rightBottom {
+          margin-top: 20px;
+        }
+      }
+    }
+    .card:nth-child(2n-1) {
+      // background: royalblue;
+      background: url(http://respub.sinoecare.net/20211222/装饰-20211222162743.png) no-repeat;
+      background-size: 100% 100%;
+    }
+    .card:nth-child(2n) {
+      // background: pink;
+      background: url(http://respub.sinoecare.net/20211222/装饰2-20211222162934.png) no-repeat;
+      background-size: 100% 100%;
+    }
+  }
+}
+</style>
diff --git a/src/apps/AppResidentDocument/DetailPeople.vue b/src/apps/AppResidentDocument/DetailPeople.vue
new file mode 100644
index 00000000..79d164dd
--- /dev/null
+++ b/src/apps/AppResidentDocument/DetailPeople.vue
@@ -0,0 +1,215 @@
+<template>
+  <div class="DetailPeople">
+    <div class="top">
+      <div class="photos">
+        <img :src="data.resident.photo" alt="" v-if="data.resident.photo" />
+        <img src="./components/img/2.png" alt="" v-else />
+      </div>
+
+      <div class="right">
+        <div class="rightTop">
+          <span class="names">{{ data.resident.name }}</span>
+
+          <span class="householdNames" v-if="data.resident.name == 1">户主</span>
+          <span class="householdNames" v-else>
+            {{ $dict.getLabel('householdRelation', data.resident.householdName) }}
+          </span>
+        </div>
+
+        <div class="rightBottom">{{ data.resident.phone }}</div>
+      </div>
+    </div>
+
+    <div class="line"></div>
+
+    <div class="middle">
+      <div class="hint">个人基本信息</div>
+
+      <div class="contents">
+        <div class="item">
+          <span>家庭地址</span>
+          <span>{{ data.resident.birthplaceAreaName }}</span>
+        </div>
+
+        <div class="item">
+          <span>身份证号</span>
+          <span>{{ data.resident.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}</span>
+        </div>
+
+        <div class="item">
+          <span>民族</span>
+          <span> {{ $dict.getLabel('nation', data.resident.householdName) }}</span>
+        </div>
+
+        <div class="item">
+          <span>文化程度</span>
+          <span>{{ $dict.getLabel('education', data.resident.education) }}</span>
+        </div>
+
+        <div class="item">
+          <span>婚姻状况</span>
+          <span>{{ $dict.getLabel('maritalStatus', data.resident.maritalStatus) }}</span>
+        </div>
+
+        <div class="item">
+          <span>政治面貌</span>
+          <span>{{ $dict.getLabel('politicsStatus', data.resident.politicsStatus) }}</span>
+        </div>
+
+        <div class="item">
+          <span>兵役状况</span>
+          <span>{{ $dict.getLabel('militaryStatus', data.resident.militaryStatus) }}</span>
+        </div>
+
+        <div class="item">
+          <span>宗教信仰</span>
+          <span>{{ $dict.getLabel('faithType', data.resident.faithType) }}</span>
+        </div>
+
+        <div class="item">
+          <span>职业</span>
+          <span>{{ $dict.getLabel('job', data.resident.job) }}</span>
+        </div>
+      </div>
+    </div>
+
+    <div class="lines"></div>
+
+    <div class="bottom">
+      <div class="hint">联络信息</div>
+
+      <div class="contents">
+        <div class="item">
+          <span>联系方式</span>
+          <span class="phones">{{ data.resident.phone }}</span>
+        </div>
+
+        <div class="item">
+          <span>现住址</span>
+          <span>{{ data.resident.currentAreaName }}</span>
+        </div>
+
+        <div class="item">
+          <span>现住详细地址</span>
+          <span>{{ data.resident.currentAddress }}</span>
+        </div>
+
+        <div class="item">
+          <span>户籍地址</span>
+          <span>{{ data.resident.householdAreaName }}</span>
+        </div>
+
+        <div class="item">
+          <span>户籍详细地址</span>
+          <span>{{ data.resident.householdAddress }}</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DetailPeople',
+  components: {},
+  props: {},
+  data() {
+    return {
+      id: '',
+      data: [],
+    }
+  },
+  computed: {},
+  watch: {},
+  onLoad(o) {
+    this.id = o.id
+    this.$dict.load('householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType', 'job').then(() => {
+      this.getDetail()
+    })
+  },
+  onShow() {},
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/appresident/detail?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.data = res.data
+          // this.$nextTick(() => {
+          //   this.currentAreaName = res.data.resident.currentAreaName
+          // })
+        }
+      })
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.DetailPeople {
+  height: 100%;
+  background: #fff;
+  .top {
+    display: flex;
+    padding: 48px 32px 32px 32px;
+    .photos {
+      img {
+        width: 112px;
+        height: 112px;
+        border-radius: 50%;
+      }
+    }
+    .right {
+      display: flex;
+      flex-direction: column;
+      width: 100%;
+      margin-left: 24px;
+      .rightTop {
+        display: flex;
+        justify-content: space-between;
+        .names {
+          font-size: 32px;
+          font-weight: 600;
+        }
+        .householdNames {
+          margin-left: 30px;
+          font-size: 26px;
+          font-weight: 500;
+          color: #5aad6a;
+        }
+      }
+      .rightBottom {
+        margin-top: 16px;
+      }
+    }
+  }
+
+  .line {
+    height: 8px;
+    background: #f5f5f5;
+  }
+
+  .middle,
+  .bottom {
+    padding: 0 32px;
+
+    .hint {
+      padding: 32px 0;
+    }
+
+    .contents {
+      .item {
+        display: flex;
+        justify-content: space-between;
+        padding: 14px 0;
+        .phones {
+          color: #3d94fb;
+        }
+      }
+    }
+  }
+
+  .lines {
+    height: 4px;
+    background: #f5f5f5;
+  }
+}
+</style>
diff --git a/src/apps/AppResidentDocument/components/img/2.png b/src/apps/AppResidentDocument/components/img/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..98b38fefc5cda64a74718efc762de9b6b671d52b
GIT binary patch
literal 888
zcmV-;1Bd*HP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px&GD$>1R7gwBlwD|(XB5Z(=SkkwHq4LK)Ya6FGO*axuF#me*hpIy@y5Hs?g}dN
zW}>242D=*$w%ZAM<BcE+yV;#G2dUU({Ya(NqzDc+JC`|Xr=8U3n>Wv25^ZPu=CerI
zxjpAOzw`C{1uJZ_!aV%HfZ@@JR)dZ+AooGZdVxIF<WCNVd>8ES{koj#6zniMnmA1I
z0s)sjF;k@K3w8Q_s1%wPI5-sVf$%0o97PhE)H)d2)izcMG(T`SJ_JE$8HsLm1zHc5
z5w{Rx14bef^)wuhfwB%Nt*n37G;H2>Qh*bHIP<{;Ac61}Z|!F`;O*h~$08Unw`wZc
zvZ>+20gz3l-Z+Rx8!#4|Y<Q`4vee@@e#y)|wbnGZcn=UbCW5>j0w93!*2eYc3hi(L
zg0@mng116}9o?nk-u34P{*pKZ2Y)QSN6Bbp_U;L^-I`BG()j(^GxyR0G|7)@YiDya
zDO6n~7Vih~4GEPe#)6XLU4GxidEZp>pODu2Ish9m2NH~J-dOiZQE7|ZncPE*Ujpm_
zPz5jr$W0}3F1XV-@@^r&{qf|i2)->cUd^=jmZha6)xh}p>hAXTSrN$|fX(htPk*rL
zmGpzGU+ScQ5DYYVJy(kY!{M;Ay0NjwIja`MnWoDO1~;WDIhOfY`#-$<aGkt-{sq8K
z0oe`|JoUdt$<MUpeAlj)q4|W#WU_{=Zni`gc29zCSNeg+<9WUa7#U9VQuH-IJQY+=
zfqZYywVdwmM&{w4GYJ6MLYLa3C(3MI07k|Vz0B|i0HXrfLZ~RYvbLk;usb<34Pv!z
zkA!K6Yhw-=jV5Zff%_mU>C9G_0H1s7H;lo+Uh4lwnpGN?O9s6g>Y_Q|?UDFb0(`xk
z&X&BH+P%})BqF*{t{iZ1Bpw6M@g9I#B?;^fw2qbl-kSrY=6wK3^o2TGFPG}jT<)>h
z5|c-}I(J+u3XG0U9?{gN-kx(l?JU)NR(<}0$n}(@PVe{ob3&cZ7X8CmEN0A_&U%-l
z$}OS|rIfNP%O(y^C*K&V(ix^-xYer}zu*6&R8?7jSz207qH<$a9QYb>t|}?$((5Py
O0000<MNUMnLSTYxG^|4a

literal 0
HcmV?d00001

diff --git a/src/apps/AppResidentFile/AppResidentFile.vue b/src/apps/AppResidentFile/AppResidentFile.vue
index 0335b9a1..317060e5 100644
--- a/src/apps/AppResidentFile/AppResidentFile.vue
+++ b/src/apps/AppResidentFile/AppResidentFile.vue
@@ -131,7 +131,7 @@ import { mapState } from 'vuex'
 
 export default {
   name: 'AppResidentFile',
-  appName: '居民档案',
+  appName: '居民信息管理',
   components: {},
   props: {},
   data() {

From a983da61ac66f10b1bcb88c59bfc2584fa84b8c2 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: Thu, 23 Dec 2021 14:34:01 +0800
Subject: [PATCH 2/5] 25768

---
 src/apps/AppPageResident/AppPageResident.vue |  4 ++--
 src/apps/AppResidentFile/AppResidentFile.vue | 11 +----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/apps/AppPageResident/AppPageResident.vue b/src/apps/AppPageResident/AppPageResident.vue
index f8c0d029..1338892c 100644
--- a/src/apps/AppPageResident/AppPageResident.vue
+++ b/src/apps/AppPageResident/AppPageResident.vue
@@ -15,7 +15,7 @@ export default {
         {
           name: '居民信息管理',
           icon: require('./img/jmxxgl.png'),
-          url: '../AppResidentFile/AppResidentFile?tabIndex=0'
+          url: '../AppResidentFile/AppResidentFile'
         },
         // {
         //   name: '居民群管理',
@@ -25,7 +25,7 @@ export default {
         {
           name: '居民档案',
           icon: require('./img/jmda.png'),
-          url: '../AppResidentFile/AppResidentFile?tabIndex=1'
+          url: '../AppResidentDocument/AppResidentDocument'
         }
       ]
     }
diff --git a/src/apps/AppResidentFile/AppResidentFile.vue b/src/apps/AppResidentFile/AppResidentFile.vue
index 317060e5..8f3516c8 100644
--- a/src/apps/AppResidentFile/AppResidentFile.vue
+++ b/src/apps/AppResidentFile/AppResidentFile.vue
@@ -136,7 +136,6 @@ export default {
   props: {},
   data() {
     return {
-      indexBar: '',
       lists: [
         {
           iconPath: 'home',
@@ -199,16 +198,8 @@ export default {
     ...mapState(['user', 'global']),
   },
   watch: {},
-  onLoad(o) {
-    if (o.tabIndex) {
-      this.indexBar = o.tabIndex
-    }
+  onLoad() {
     this.getEchart1()
-    this.getEchart2()
-    this.getList()
-    this.getList2()
-
-    this.currentTabBar = this.indexBar
     this.areaId = this.user.areaId
   },
   mounted() {

From 774273d9b2626c1a0360335fa84f37ef508f204c 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: Thu, 23 Dec 2021 14:55:22 +0800
Subject: [PATCH 3/5] 25768

---
 .../AppResidentDocument.vue                   |  37 +++++++++++++++---
 .../AppResidentDocument/components/img/1.png  | Bin 0 -> 740 bytes
 .../AppResidentDocument/components/img/11.png | Bin 0 -> 1574 bytes
 .../AppResidentDocument/components/img/22.png | Bin 0 -> 1804 bytes
 .../AppResidentDocument/components/img/4.png  | Bin 0 -> 1339 bytes
 .../AppResidentDocument/components/img/44.png | Bin 0 -> 2733 bytes
 src/apps/AppResidentFile/AppResidentFile.vue  |  26 ++++++++++--
 7 files changed, 54 insertions(+), 9 deletions(-)
 create mode 100644 src/apps/AppResidentDocument/components/img/1.png
 create mode 100644 src/apps/AppResidentDocument/components/img/11.png
 create mode 100644 src/apps/AppResidentDocument/components/img/22.png
 create mode 100644 src/apps/AppResidentDocument/components/img/4.png
 create mode 100644 src/apps/AppResidentDocument/components/img/44.png

diff --git a/src/apps/AppResidentDocument/AppResidentDocument.vue b/src/apps/AppResidentDocument/AppResidentDocument.vue
index 40d872f1..9cf4876e 100644
--- a/src/apps/AppResidentDocument/AppResidentDocument.vue
+++ b/src/apps/AppResidentDocument/AppResidentDocument.vue
@@ -2,7 +2,7 @@
   <div class="AppResidentDocument">
     <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
 
-    <AiAreaPicker v-model="areaId" all :areaId="areaId" @select="areaSelect"></AiAreaPicker>
+    <!-- <AiAreaPicker v-model="areaId"  :areaId="areaId" @select="areaSelect"></AiAreaPicker> -->
 
     <div class="line"></div>
 
@@ -12,7 +12,7 @@
 
     <div class="datas" v-if="datas.length > 0">
       <div class="datass" v-for="(item, iindex) in datas" :key="iindex" @click="toDetailCard(item)">
-        <!-- <div class="left">
+        <div class="left">
           <img :src="item.photo" alt="" v-if="item.photo" />
           <img src="./components/img/4.png" alt="" v-else />
         </div>
@@ -22,6 +22,23 @@
           <div class="rightBottom">
             <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}</span>
 
+            <span>{{ item.phone }}</span>
+          </div>
+        </div>
+
+        <!-- <div class="left">
+          <img :src="item.avatar" alt="" v-if="item.photo" />
+          <img src="./components/img/4.png" alt="" v-else />
+        </div>
+
+        <div class="right">
+          <div class="rightTop">
+            {{ item.corpName }}
+            <span v-if="item.corpFullName" style="margin-left: 4px">@{{ item.corpFullName }}</span>
+          </div>
+          <div class="rightBottom">
+            <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}</span>
+
             <span>{{ item.phone }}</span>
           </div>
         </div> -->
@@ -33,6 +50,8 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
   name: 'AppResidentDocument',
   appName: '居民档案',
@@ -40,6 +59,7 @@ export default {
   props: {},
   data() {
     return {
+      keyword: '',
       datas: [],
       current: 1,
       size: 10,
@@ -54,18 +74,23 @@ export default {
       currentTabs: 0,
     }
   },
-  computed: {},
+  computed: {
+    ...mapState(['user', 'global']),
+  },
   watch: {},
-  onLoad() {},
+  onLoad() {
+    this.getList()
+  },
   onShow() {},
   methods: {
     getList() {
       this.$http
-        .post('/app/wxcp/wxcustomer/list', null, {
+        .post('/app/appresident/list', null, {
           params: {
             size: this.size,
             current: this.current,
-            // createUserId: this.currentTabs == 1 ? this.user.id : '',
+            con: this.keyword,
+            residentType: this.currentTabs == 0 ? '0' : '1',
           },
         })
         .then((res) => {
diff --git a/src/apps/AppResidentDocument/components/img/1.png b/src/apps/AppResidentDocument/components/img/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ed1e302495e0daebf665648cb0b34f31855ec9b
GIT binary patch
literal 740
zcmV<A0vr8_P)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px%o=HSOR7gw3mQQFCK@`TnZ#J9VrvEUgrFsxsMJgWDgQ!?gbYtyFMRM~XJyfhs
zV`%NsV<`xMYC$|Hh*b0-9z1%fSQJm<&9oGuP{b1Z$EMNUeUdiOG;Jf<#5$LSnR)NG
z-^}+OLu~TkCiC$BflYn0?TWYuqOnx<0(=G3jq$<Sk&R;4DBROOHwDO!Qel7g%R(Yq
zAH;qBTrbBuz*+GQTZv35Zk-yaoB3D3w-C4>j^zNA0=~;8Jd*i}K!l9b;UG160?5e<
z0cnfK09<u9?WA?n?|US|g8;7(GA)o1lDqPc&$B`SCI!3<DpQI5K!l&+s`ECSYF$$o
z01N=)FT5+yK-*@E=98-cx(TT4QH}zbC(*u<xjX{}a0qCny4EwWR8WOXQ#!T`h3bHv
zwx{xu;^P*dralp(3FrdyOcWlb9sPsCcUOnrqEhv*6L*;QQuqr1eyk46xRNyhzBwY{
z*qK1mp~MI|nu2l2#8NM*CCqXCacAe+_U5Uz3E+w&XQOR_W^vtNaK%`Q>7`)6tQv#J
zK0?N{<b0?rygl>NzlT@gNKdFLE{^*q2P*_-3AcMJv#)%hi*pgn=m2pkKUu!Q?EFNJ
zWj2=$v|X(+8uGm-u(J?oYDT@QbGiHIG@Qt3j+YHww7IRn&HoWV!zu>@Ulify&)ET^
zDR!Kx+?=;Nba|rN^4}t16{}K$iHK$FEnA@oh9Z{v3Xtc;fC9v#mKpyGaBc>WVDUsu
zISPlPr~F+cu5VD_FGiEb#iwC9MS;6-&UI*zOl=v(o0?3(HA7vNv??-V{r$`P$w`O|
zHztjExB#}iyk63V-s$QZS1+nE6SrjOi@CSU(94-RUu{sk*2-k@do3=b;;Wnf5dH=F
W^ffH$)xuE#0000<MNUMnLSTY8DPJ4_

literal 0
HcmV?d00001

diff --git a/src/apps/AppResidentDocument/components/img/11.png b/src/apps/AppResidentDocument/components/img/11.png
new file mode 100644
index 0000000000000000000000000000000000000000..e84f6420ea3d12d602ddbc514f991f6effcb9c73
GIT binary patch
literal 1574
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
Y0pu&%SICquZ2$lO07*qoM6N<$g2^i5jQ{`u

literal 0
HcmV?d00001

diff --git a/src/apps/AppResidentDocument/components/img/22.png b/src/apps/AppResidentDocument/components/img/22.png
new file mode 100644
index 0000000000000000000000000000000000000000..22251413d8a29026700a61bafe5c76257c9687a3
GIT binary patch
literal 1804
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

literal 0
HcmV?d00001

diff --git a/src/apps/AppResidentDocument/components/img/4.png b/src/apps/AppResidentDocument/components/img/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7cee62305148392849d5542c34d63ed24aad0aa
GIT binary patch
literal 1339
zcmV-B1;qM^P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px(^+`lQR9Hv7Sxrn_RTTctdo#dL89>T^uoMckm`0moshDWMmFcDnwXu?P(Tz&e
zwRO>uF6_RM+D#Wt0He5YL)<}(2{K4cl~|#OtwnyMQygZ>&%oSw%zb5Wn0dpycPQTN
z-1FV<p8L)@-#J6bV0Ct~QFjVWB&;?N9cShSfXhM1v*8#KfaZv30?fDBGzKR7G1}Ql
zmhN$+V{mJTE4_x*!Gv}&SLxV-Xqp(^8<x>^u7ze)ZIuY#3UHB^tt(7?9*k^NaL0Xw
zC^6mKAmj46W_s*~<w~&ohu9e+d<I~@8<^(rL1tWNf7SElPIhSt4i2(sHrKia<_`e4
zUPO~zd^>~aM#YM8v9*<AP8f~{e>KFubwl(Ka4N%twaggk&$7&S-ff}PWWyAK(sMID
z@r^3E94}Co5BPnAY!86}EJqnLi;VD^I!{Tma@9PY?8y{@JppkY%pbZzn+9;Cf>8B5
zfhhGMEN1-vH)B4;coKC(+x(sA^Y@$0j}mupL*5LCFWkO4gMj8*Lg7Bc^<-wo)B@w)
zy!5T>lH1=)44f^3GL?8(jH^UzeHr0UsXMtuI(PmQm<_oSlpBIEG7ra7&=$eoVbR6l
zZSHk~liqu?(SX;Z7ub<C#`hCyg@i!Y&z>|p<oWg~vO;)FF{P4(3vz*$I#bCN$(si5
z3ao7?m=dBfVb;ouV-xHh7N0Wsl7cBJ3V@dnWJYjgN+9?|<rL{Tx_b7c`3c#D|1Il*
zYHh77B)s&3-uD-$G<siPA*@DF*6zt~jcV%okxxK~fT9_S^MF@s_TGawAJc56-eK`E
zgRiO*^m&2S#>@x~{wA=xu6mOF%$KM)VD&LuZ>yU5bAZ?C4aelX6NXH1Lz5PkQi@r6
zD<b1->KPWl0DM%H;Gt4NeOYGT;Jtavt}g0}#;7MC9)Vd|N|hG?$1;rKpB@OzFR9Z5
zQIL89u{D+a7l)N)_t*hKS-zeZXaBMA^Fy}9gz}Q&R+pdz_ZUFiiv~QhtSGFQU<}-~
z5K}88{~>M?d<524%Lj|4no*19v1x(nMTMKBZV74!Ng_sL1);ilr>A}@xfGR*!wqOm
zJIy4cG}js^dd~T&gAvBaAG+_F@WL|9=qBo9f=vevl=z(qE`%AQ_jf^1CTiVMm*T-1
z14Vhx1RqBjfn9jeE_J$MA(5br<~NQQb}!<z)?<wC#w~1!3<4xB7Nn_;+=?HS?*ooj
z5&XWL^Pv=~zy4)maaoV#mfVtNs)9Ak1IS8JS!h5CSDkh_vdWkZG3G*y6*s|<ELb<a
zm{#&jGPNaS2ZK`wr{f!0OG3-Q)Pj{(8>UEp+ly(MCfQn6@83N!r%TL*o|Zprd;N26
znj}DS+j+R0P*b8;b9KBa_sSZ5=iwH^^lfJxINrGL%LZO=(ARys1m!SM>cr5B{G?qP
zcL^RJebklGsZ4dBE=l=4j?b~$=tF|b;n9f(^yTONKf|M?RrHUHLv45zzdbX1mZG@E
zj6EH{5#dIDHZBrrjNcNUC=}&0Z0*eelMGxa$fnE&n299AVJ@<=a0QI>jNOfZ35bGl
z(^$u4zyBGGfD?(XFjuaxp@V^T0D41oV48sLtQ>UZ(lZ{SCr2eS8{rK!u|OLL#~ElK
xMmezgHv|x2!W;n;VB97X1AZ??iS+-5_!ox=9&h&}fgJz<002ovPDHLkV1iC>fBpaf

literal 0
HcmV?d00001

diff --git a/src/apps/AppResidentDocument/components/img/44.png b/src/apps/AppResidentDocument/components/img/44.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae49d85fa8ea96c766d1678f7b9b1aacf95641a8
GIT binary patch
literal 2733
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

literal 0
HcmV?d00001

diff --git a/src/apps/AppResidentFile/AppResidentFile.vue b/src/apps/AppResidentFile/AppResidentFile.vue
index 8f3516c8..13939874 100644
--- a/src/apps/AppResidentFile/AppResidentFile.vue
+++ b/src/apps/AppResidentFile/AppResidentFile.vue
@@ -76,6 +76,26 @@
         <div class="datas" v-if="data.length > 0">
           <div class="datass" v-for="(item, iindex) in data" :key="iindex" @click="toDetailCard(item)">
             <div class="left">
+              <img :src="item.avatar" alt="" v-if="item.photo" />
+              <img src="./components/img/4.png" alt="" v-else />
+            </div>
+
+            <div class="right">
+              <div class="rightTop">
+                {{ item.corpName }}
+                <span v-if="item.corpFullName" style="color: #3c7fc8; margin-left: 4px">@{{ item.corpFullName }}</span>
+              </div>
+              <div class="rightBottom">
+                <span>
+                  <span>{{ item.name }}</span>
+                  <!-- {{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }} -->
+                </span>
+
+                <!-- <span>{{ item.phone }}</span> -->
+              </div>
+            </div>
+
+            <!-- <div class="left">
               <img :src="item.photo" alt="" v-if="item.photo" />
               <img src="./components/img/4.png" alt="" v-else />
             </div>
@@ -87,7 +107,7 @@
 
                 <span>{{ item.phone }}</span>
               </div>
-            </div>
+            </div> -->
           </div>
         </div>
 
@@ -240,12 +260,12 @@ export default {
 
     getList() {
       this.$http
-        .post('/app/appresident/list', null, {
+        .post('/app/wxcp/wxcustomer/list', null, {
           params: {
             size: 10,
             current: this.current,
             areaId: this.areaId,
-            con: this.keyword,
+            name: this.keyword,
             residentType: this.currentPeople == 0 ? '0' : '1',
           },
         })

From d32293b942ae24de1ff3db64155905a33c0fa2d1 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 23 Dec 2021 15:09:25 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E9=97=BB=E8=B5=84=E8=AE=AF?=
 =?UTF-8?q?=E7=B1=BB=E9=87=8D=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppPageBasic/AppPageBasic.vue        |   2 +-
 .../AppPageCivilization.vue                   |   4 +-
 src/apps/AppPageParty/AppPageParty.vue        |   2 +-
 src/apps/AppServicePublic/Add.vue             | 128 ++++++++++++------
 .../AppServicePublic/AppServicePublic.vue     | 114 ++++++++++++----
 src/apps/AppServicePublic/Detail.vue          |  51 +++++--
 6 files changed, 220 insertions(+), 81 deletions(-)

diff --git a/src/apps/AppPageBasic/AppPageBasic.vue b/src/apps/AppPageBasic/AppPageBasic.vue
index 60ab8280..77a6d885 100644
--- a/src/apps/AppPageBasic/AppPageBasic.vue
+++ b/src/apps/AppPageBasic/AppPageBasic.vue
@@ -20,7 +20,7 @@ export default {
         {
           name: '三务公开',
           icon: require('./img/shgk.png'),
-          url: '../AppServicePublic/AppServicePublic?moduleId=b03d1ea68c8449ecb00685644e3f0192'
+          url: '../AppServicePublic/AppServicePublic?moduleId=b03d1ea68c8449ecb00685644e3f0192&listName=三务公开'
         }
       ]
     }
diff --git a/src/apps/AppPageCivilization/AppPageCivilization.vue b/src/apps/AppPageCivilization/AppPageCivilization.vue
index 27fcd6af..b05a1f0e 100644
--- a/src/apps/AppPageCivilization/AppPageCivilization.vue
+++ b/src/apps/AppPageCivilization/AppPageCivilization.vue
@@ -20,12 +20,12 @@ export default {
         {
           name: '好人好事',
           icon: require('./img/hrhs.png'),
-          url: '../AppServicePublic/AppServicePublic?moduleId=5da220f3182047aba92d64ac08b93b55'
+          url: '../AppServicePublic/AppServicePublic?moduleId=5da220f3182047aba92d64ac08b93b55&listName=好人好事'
         },
         {
           name: '五好家庭',
           icon: require('./img/whjt.png'),
-          url: '../AppServicePublic/AppServicePublic?moduleId=6afadf4cd44f4b73be29390b30ca88bb'
+          url: '../AppServicePublic/AppServicePublic?moduleId=6afadf4cd44f4b73be29390b30ca88bb&listName=五好家庭'
         }
       ]
     }
diff --git a/src/apps/AppPageParty/AppPageParty.vue b/src/apps/AppPageParty/AppPageParty.vue
index dc8d2303..c1c630c8 100644
--- a/src/apps/AppPageParty/AppPageParty.vue
+++ b/src/apps/AppPageParty/AppPageParty.vue
@@ -20,7 +20,7 @@ export default {
         {
           name: '党建要闻',
           icon: require('./img/djyw.png'),
-          url: '../AppServicePublic/AppServicePublic?moduleId=95f0f1c509e44d528069bc9f9dc19e53'
+          url: '../AppServicePublic/AppServicePublic?moduleId=95f0f1c509e44d528069bc9f9dc19e53&listName=党建要闻'
         },
         {
           name: '党员学习',
diff --git a/src/apps/AppServicePublic/Add.vue b/src/apps/AppServicePublic/Add.vue
index 0916aad4..79ed31c4 100644
--- a/src/apps/AppServicePublic/Add.vue
+++ b/src/apps/AppServicePublic/Add.vue
@@ -6,18 +6,20 @@
           <u-input v-model="forms.title" placeholder="请输入标题(30字以内)" type="textarea" auto-height height="60" maxlength="30" />
         </u-form-item>
 
-        <u-form-item label="公开类型" prop="status" required style="position: relative">
-          <u-input v-model="forms.status" disabled placeholder="请选择公开类型" @click="showStstus = true" />
-
-          <u-select v-model="showStstus" :list="$dict.getDict('realityStatus')" value-name="dictValue" label-name="dictName" @confirm="selectStatus"></u-select>
-
-          <u-icon name="arrow-right" color="#CCCCCC" style="position: absolute; top: 25px; right: 30px"></u-icon>
+        <u-form-item label="类别" prop="status" required>
+          <div class="right" @click="showStstus=true">
+            <span v-if="forms.showIndex === ''" class="color-999">请选择类别</span>
+            <span v-else>{{selectList[forms.showIndex].categoryName}}</span>
+            <u-icon name="arrow-right" color="#CCCCCC" class="right-icon"></u-icon>
+          </div>
+          <u-select v-model="showStstus" :list="selectList" value-name="showIndex" label-name="categoryName" @confirm="selectStatus"></u-select>
         </u-form-item>
 
-        <u-form-item label="发布地区" prop="areaId" required style="position: relative">
-          <AiAreaPicker v-model="forms.areaId" :areaId="areaIdProps" @select="areaSelect"></AiAreaPicker>
-
-          <u-icon name="arrow-right" color="#CCCCCC" style="position: absolute; top: 25px; right: 30px"></u-icon>
+        <u-form-item label="发布地区" prop="areaId" required >
+          <div class="right">
+            <AiAreaPicker v-model="forms.areaId" :areaId="user.areaId" @select="areaSelect"></AiAreaPicker>
+            <u-icon name="arrow-right" color="#CCCCCC" class="right-icon area-right-icon"></u-icon>
+          </div>
         </u-form-item>
 
         <u-form-item label="正文" prop="content" required label-position="top">
@@ -48,16 +50,17 @@ export default {
       id: '',
       forms: {
         title: '',
-        status: '',
-        statusValue: '',
         content: '',
         fileIds: [],
         areaId: '',
+        showIndex: '',
       },
       showStstus: false,
       flag: false,
       areaIdProps: '',
-      moduleId: ''
+      moduleId: '',
+      listName: '',
+      selectList: []
     }
   },
   computed: { ...mapState(['user']) },
@@ -65,27 +68,42 @@ export default {
     console.log(o)
     this.id = o.id
     this.moduleId = o.moduleId
-    this.areaIdProps = this.user.areaId
-    this.$dict.load('realityStatus').then(() => {
-      this.getDetail()
-    })
+    this.forms.areaId = this.user.areaId
+    this.listName = o.listName
+    this.getType()
   },
 
   mounted() {},
   methods: {
-    // getDetail() {
-    //   this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.id}`).then((res) => {
-    //     if (res?.data) {
-    //       this.forms = res.data
-    //       this.forms.statusValue = res.data.status
-    //       this.forms.status = this.$dict.getLabel('realityStatus', res.data.status)
-    //       if (res.data.images) {
-    //         this.forms.images = JSON.parse(res.data.images || '[]')
-    //       }
-    //     }
-    //   })
-    // },
-
+    getDetail() {
+      this.$http.post(`/app/appcontentinfo/queryDetailById?id=${this.id}`).then((res) => {
+        if (res?.data) {
+          this.forms = {...res.data}
+          if(this.selectList.length) {
+            this.selectList.map((item, index) => {
+              if(item.id == res.data.categoryId) {
+                this.forms.showIndex = index
+              }
+            })
+          }
+          if (res.data.images) {
+            this.forms.images = JSON.parse(res.data.images || '[]')
+          }
+        }
+      })
+    },
+    getType() {
+      this.$http.post(`/app/appcontentmoduleinfo/listByName?names=${this.listName}`).then((res) => {
+        if (res.code == 0) {
+          if(res.data && res.data[0].categoryList.length) {
+            this.selectList = res.data[0].categoryList
+            if(this.id) {
+              this.getDetail()
+            }
+          }
+        }
+      })
+    },
     submit() {
       if (this.flag) return
 
@@ -98,6 +116,10 @@ export default {
             return this.$u.toast('请输入正文')
           }
 
+          if(this.selectList.length && this.forms.showIndex === '') {
+            return this.$u.toast('请选择类别')
+          }
+
           const imgs = []
           if (this.forms.fileIds) {
             this.forms.fileIds.map((e) => {
@@ -106,22 +128,21 @@ export default {
           }
 
           this.flag = true
-          this.$http
-            .post(`/app/appvisitvondolence/addOrUpdate`, {
+          this.$http.post(`/app/appcontentinfo/addOrUpdate`, {
               title: this.forms.title,
-              status: this.forms.statusValue ? this.forms.statusValue : this.forms.status,
               areaId: this.forms.areaId,
               content: this.forms.content,
-              // images: JSON.stringify(imgs) || [],
-              images: imgs || [],
+              files: imgs || [],
               id: this.id,
-              moduleId: this.moduleId
+              moduleId: this.moduleId,
+              categoryId: this.selectList[this.forms.showIndex].id,
+	            categoryName: this.selectList[this.forms.showIndex].categoryName,
             })
             .then((res) => {
               if (res.code == 0) {
                 this.$u.toast('发布成功')
                 this.flag = false
-                uni.navigateTo({ url: `./AppServicePublic` })
+                uni.navigateBack()
               }
             })
         } else {
@@ -135,8 +156,7 @@ export default {
     },
 
     selectStatus(e) {
-      this.forms.status = e[0].label
-      this.forms.statusValue = e[0].value
+      this.forms.showIndex = e[0].value
     },
   },
 }
@@ -185,5 +205,35 @@ export default {
     font-weight: 500;
     color: #ffffff;
   }
+
+  .right{
+    width: 100%;
+    text-align: right;
+    .right-icon{
+      vertical-align: middle;
+      margin-left: 8px;
+    }
+    .area-right-icon{
+      margin: -40px 0 0 8px;
+    }
+    ::v-deep .AiAreaPicker{
+      display: inline-block;
+      width: calc(100% - 50px);
+      .areaSelector{
+        div{
+          width: 100%;
+          padding-top: 30px;
+          box-sizing: border-box;
+          text-align: right;
+        }
+        .fixedTop{
+          text-align: left;
+        }
+      }
+    }
+  }
+  .color-999{
+    color: #999;
+  }
 }
 </style>
diff --git a/src/apps/AppServicePublic/AppServicePublic.vue b/src/apps/AppServicePublic/AppServicePublic.vue
index e774b5f5..9822d537 100644
--- a/src/apps/AppServicePublic/AppServicePublic.vue
+++ b/src/apps/AppServicePublic/AppServicePublic.vue
@@ -1,8 +1,13 @@
 <template>
   <div class="AppServicePublic">
+    <AiTopFixed v-if="tabs.length">
+      <div class="tab-select" @click="tabClick(item)">
+        <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(item)">{{item.categoryName}}<span></span></div>
+      </div>
+    </AiTopFixed>
     <div class="header-top">
       <div>区域选择</div>
-      <AiAreaPicker v-model="areaId" :areaId="areaId" @select="areaSelect"></AiAreaPicker>
+      <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect"></AiAreaPicker>
     </div>
 
     <u-search class="serach_content" placeholder="请输入公开标题" :show-action="false" v-model="keyword" @clear="clearSearch" @search="search"></u-search>
@@ -10,16 +15,16 @@
     <template v-if="datas.length > 0">
       <AiCard v-for="(item, i) in datas" :key="i" @click.native="toAdd(item, 1)">
         <template #custom>
-          <div class="titles">{{ item.createUserName }}</div>
+          <div class="titles">{{ item.title }}</div>
 
           <div class="flex">
             <span class="left">
-              <span class="garydiv">财务公开</span>
-              <span class="times">2021-12-16</span>
+              <span class="garydiv" v-if="item.categoryName">{{item.categoryName}}</span>
+              <span class="times">{{item.createTime.substring(0, 10)}}</span>
             </span>
 
             <span class="right">
-              <span class="font">1111</span>
+              <span class="font">{{item.viewCount}}</span>
               <span>人看过</span>
             </span>
           </div>
@@ -66,7 +71,11 @@ export default {
       pages: 0,
       deletShow: false,
       deletId: '',
-      moduleId: ''
+      moduleId: '',
+      listName: '',
+      tabs: [],
+      tabIndex: 0,
+      categoryId: ''
     }
   },
   computed: {
@@ -80,27 +89,47 @@ export default {
   onLoad(o) {
     this.areaId = this.user.areaId
     this.moduleId = o.moduleId
+    this.listName = o.listName
+    this.getType()
     this.getList()
   },
   mounted() {},
   methods: {
-    getList() {
-      this.$http
-        .post('/app/appvisitvondolence/list', null, {
-          params: {
-            size: 6,
-            current: this.current,
-            areaId: this.areaId,
-            title: this.keyword,
-            moduleId: this.moduleId
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
-            this.pages = res.data.pages
+    getType() {
+      this.$http.post(`/app/appcontentmoduleinfo/listByName?names=${this.listName}`).then((res) => {
+        if (res.code == 0) {
+          if(res.data && res.data[0].categoryList.length) {
+            var all = [{
+              categoryName: '全部',
+              id: '',
+              showIndex: 0,
+            }]
+            this.tabs = [...all, ... res.data[0].categoryList]
           }
-        })
+        }
+      })
+    },
+    tabClick(row) {
+      this.tabIndex = row.showIndex
+      this.categoryId = row.id
+    },
+    getList() {
+      this.$http.post('/app/appcontentinfo/list', null, {
+        params: {
+          size: 6,
+          current: this.current,
+          areaId: this.areaId,
+          title: this.keyword,
+          moduleId: this.moduleId,
+          categoryId: this.categoryId
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+          this.pages = res.data.pages
+        }
+      })
     },
 
     areaSelect(e) {
@@ -111,15 +140,15 @@ export default {
     toAdd(item, type) {
       if (type == '1') {
         console.log('详情')
-        uni.navigateTo({ url: `./Detail?id=${item.id}` })
+        uni.navigateTo({ url: `./Detail?id=${item.id}&listName=${this.listName}` })
       }
       if (type == '2') {
         console.log('编辑')
-        uni.navigateTo({ url: `./Add?id=${item.id}` })
+        uni.navigateTo({ url: `./Add?id=${item.id}&moduleId=${this.moduleId}&listName=${this.listName}` })
       }
       if (type == null) {
         console.log('添加')
-        uni.navigateTo({ url: `./Add?moduleId=${this.moduleId}` })
+        uni.navigateTo({ url: `./Add?moduleId=${this.moduleId}&listName=${this.listName}` })
       }
     },
 
@@ -148,6 +177,41 @@ export default {
 uni-page-body {
   height: 100%;
 }
+::v-deep .content{
+  padding: 0!important;
+}
+.tab-select{
+  width: 100%;
+  height: 96px;
+  line-height: 96px;
+  background: #3975C6;
+  display: flex;
+  .item{
+    flex: 1;
+    text-align: center;
+    font-size: 28px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: #CDDCF0;
+  }
+  .active{
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    position: relative;
+    color: #fff;
+    span{
+      width: 48px;
+      height: 4px;
+      background: #FFF;
+      position: absolute;
+      bottom: 14px;
+      left: 50%;
+      margin-left: -24px;
+    }
+  }
+}
+.iconfont-iconMore{
+  margin-top: 8px;
+}
 .AppServicePublic {
   height: 100%;
 
diff --git a/src/apps/AppServicePublic/Detail.vue b/src/apps/AppServicePublic/Detail.vue
index d7528ddf..d2b9cbd7 100644
--- a/src/apps/AppServicePublic/Detail.vue
+++ b/src/apps/AppServicePublic/Detail.vue
@@ -1,20 +1,22 @@
 <template>
   <div class="Detail">
     <div class="header-top">
-      <div class="titles">刘家村村规民约</div>
+      <div class="titles">{{data.title}}</div>
 
       <div class="titles-bottom">
         <span>类型：</span>
-        <span>财务公开</span>
+        <span>{{selectList[data.showIndex].categoryName}}</span>
         <span class="to-left">浏览量：</span>
-        <span>26</span>
+        <span>{{data.viewCount}}</span>
       </div>
     </div>
 
     <div class="header-middle">
-      <span class="contsnts">为了推进我村民主法治建设，维护社会稳定，促进经济发展，规范村民清洁乡村卫生行为，改善村容村貌，推进“生态乡村”建设，树立良好的民风、村风，创造安居乐业的社会环境，经全体村民代表讨论通过，制定本村规民约。</span>
-
-      <img src="" alt="" />
+      <span class="contsnts">{{data.content}}</span>
+      <div class="img-list" v-if="data.files && data.files.length">
+        <img :src="item.accessUrl" alt="" v-for="(item, index) in data.files" :key="index" />
+      </div>
+      
     </div>
   </div>
 </template>
@@ -26,26 +28,41 @@ export default {
   props: {},
   data() {
     return {
-      data: [],
+      data: {},
       id: '',
+      listName: '',
+      selectList: []
     }
   },
   computed: {},
   watch: {},
   onLoad(o) {
     this.id = o.id
-    this.$dict.load('realityStatus').then(() => {
-      // this.getDetail()
-    })
+    this.listName = o.listName
+    this.getType()
   },
   mounted() {},
   methods: {
     getDetail() {
-      this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.id}`).then((res) => {
+      this.$http.post(`/app/appcontentinfo/queryDetailById?id=${this.id}`).then((res) => {
         if (res?.data) {
           this.data = res.data
-          if (this.data.images) {
-            this.data.images = JSON.parse(this.data.images || '[]')
+          if(this.selectList.length) {
+            this.selectList.map((item, index) => {
+              if(item.id == res.data.categoryId) {
+                this.data.showIndex = index
+              }
+            })
+          }
+        }
+      })
+    },
+    getType() {
+      this.$http.post(`/app/appcontentmoduleinfo/listByName?names=${this.listName}`).then((res) => {
+        if (res.code == 0) {
+          if(res.data && res.data[0].categoryList.length) {
+            this.selectList = res.data[0].categoryList
+            this.getDetail()
           }
         }
       })
@@ -92,5 +109,13 @@ uni-page-body {
       height: 486px;
     }
   }
+
+  .img-list{
+    img{
+      width: 204px;
+      height: 204px;
+      margin: 0 8px 8px 0;
+    }
+  }
 }
 </style>

From f443e04710af1435995948887d38c0d47c550882 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 23 Dec 2021 15:11:22 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppPageInteraction/AppPageInteraction.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppPageInteraction/AppPageInteraction.vue b/src/apps/AppPageInteraction/AppPageInteraction.vue
index 6e466125..aee6d116 100644
--- a/src/apps/AppPageInteraction/AppPageInteraction.vue
+++ b/src/apps/AppPageInteraction/AppPageInteraction.vue
@@ -25,7 +25,7 @@ export default {
         {
           name: '问卷表单',
           icon: require('./img/wjbd.png'),
-          url: '../AppAskForm/AppForm'
+          url: '../AppAskForm/AppAskForm'
         }
       ]
     }