diff --git a/src/apps/AppResidentFile/AppResidentFile.vue b/src/apps/AppResidentFile/AppResidentFile.vue
index 13939874..b0799d3d 100644
--- a/src/apps/AppResidentFile/AppResidentFile.vue
+++ b/src/apps/AppResidentFile/AppResidentFile.vue
@@ -62,7 +62,27 @@
@@ -192,14 +198,14 @@ export default {
Echarts2: null,
areaId: '',
currentPeople: 0,
- tabPeopleList: [
- {
- name: '本地居民',
- },
- {
- name: '流动人员',
- },
- ],
+ // tabPeopleList: [
+ // {
+ // name: '本地居民',
+ // },
+ // {
+ // name: '流动人员',
+ // },
+ // ],
current: 1,
keyword: '',
data: [],
@@ -212,6 +218,10 @@ export default {
todayList2: [],
counts1: '',
counts2: '',
+ page2: { current: 1, size: 10, total: 0 },
+ search2: { name: '' },
+ page1: { current: 1, size: 10, total: 0 },
+ search1: { name: '' },
}
},
computed: {
@@ -226,10 +236,37 @@ export default {
this.Echarts1 = echarts.init(document.getElementById('echarts1'))
},
methods: {
+ getList() {
+ this.$http
+ .post('/app/wxcp/wxcustomer/list', null, {
+ params: { ...this.page1, ...this.search, type: 1 },
+ })
+ .then((res) => {
+ if (res?.data) {
+ if (this.page.current > 1) {
+ this.data = [...this.data, ...res.data.records]
+ } else this.data = res.data.records
+ this.page.total = res.data.total
+ }
+ })
+ },
+ reachBottom() {
+ if (this.page.total > this.list.length) {
+ this.page.current++
+ this.getList()
+ }
+ },
+ showResident({ id }) {
+ id &&
+ uni.navigateTo({
+ url: './resident?id=' + id,
+ })
+ },
+
getList2() {
this.$http
.post('/app/wxcp/wxgroup/list', null, {
- params: { ...this.page, ...this.search },
+ params: { ...this.page2, ...this.search },
})
.then((res) => {
if (res?.data) {
@@ -247,7 +284,7 @@ export default {
reachBottom() {
if (this.page.total > this.list.length) {
- this.page.current++
+ this.page.current = this.page.current + 1
this.getList2()
}
},
@@ -258,26 +295,28 @@ export default {
})
},
- getList() {
- this.$http
- .post('/app/wxcp/wxcustomer/list', null, {
- params: {
- size: 10,
- current: this.current,
- areaId: this.areaId,
- name: this.keyword,
- residentType: this.currentPeople == 0 ? '0' : '1',
- },
- })
- .then((res) => {
- if (res.code == 0) {
- this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
- this.pages = res.data.pages
- }
- })
- },
+ // getList() {
+ // this.$http
+ // .post('/app/wxcp/wxcustomer/list', null, {
+ // params: {
+ // size: 10,
+ // current: this.current,
+ // areaId: this.areaId,
+ // name: this.keyword,
+ // residentType: this.currentPeople == 0 ? '0' : '1',
+ // },
+ // })
+ // .then((res) => {
+ // if (res.code == 0) {
+ // this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
+ // this.pages = res.data.pages
+ // }
+ // })
+ // },
+ //
// 居民群统计
+
getEchart1() {
this.$http.post(`/app/wxcp/wxgroup/groupStatistic`).then((res) => {
if (res.code === 0) {
@@ -501,26 +540,26 @@ export default {
}
},
- toDetailCard(item) {
- uni.navigateTo({ url: `./DetailCard?id=${item.id}` })
- },
+ // toDetailCard(item) {
+ // uni.navigateTo({ url: `./DetailCard?id=${item.id}` })
+ // },
- areaSelect(e) {
- this.areaId = e.id
- this.getList()
- },
+ // areaSelect(e) {
+ // this.areaId = e.id
+ // this.getList()
+ // },
- handerSearch(e) {
- this.keyword = e
- this.current = 1
- this.getList()
- },
+ // handerSearch(e) {
+ // this.keyword = e
+ // this.current = 1
+ // this.getList()
+ // },
- handerClear() {
- this.keyword = ''
- this.current = 1
- this.getList()
- },
+ // handerClear() {
+ // this.keyword = ''
+ // this.current = 1
+ // this.getList()
+ // },
changeTab(e) {
this.currentTabBar = e
@@ -651,52 +690,124 @@ uni-page-body {
.currentTabBar1 {
height: 100%;
background: #fff;
- .AiAreaPicker {
- padding: 16px 0 14px 12px;
- }
+ ::v-deep .AiTopFixed {
+ b.title {
+ color: #333;
+ font-size: 32px;
- .line {
- height: 16px;
- background: #f5f5f5;
- }
-
- .peopleCard {
- background: #fff;
- .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;
- }
- }
+ & > i {
+ color: #267fce;
+ font-style: normal;
+ margin: 0 4px;
}
}
}
+
+ ::v-deep .mainPane {
+ background: #fff;
+ padding: 0 32px;
+
+ .AiCell {
+ flex-shrink: 0;
+ justify-content: flex-start;
+
+ .content {
+ flex: 1;
+ min-width: 0;
+ max-width: unset;
+ border-bottom: 1px solid rgba(221, 221, 221, 1);
+ min-height: 160px;
+ }
+ }
+
+ .card {
+ text-align: left;
+
+ b {
+ max-width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ font-size: 36px;
+ }
+
+ .tag {
+ justify-content: center;
+ background: #f3f4f7;
+ border-radius: 4px;
+ padding: 0 16px;
+ font-size: 28px;
+ font-weight: 400;
+ color: #333;
+ margin-left: 16px;
+ margin-bottom: 16px;
+ height: 56px;
+ }
+
+ .realName {
+ width: 100%;
+ margin-top: 8px;
+ font-size: 28px;
+ font-weight: 400;
+ color: #999;
+ }
+ }
+
+ .AiImage {
+ margin-right: 24px;
+
+ image {
+ width: 112px;
+ height: 112px;
+ }
+ }
+ }
+ // .AiAreaPicker {
+ // padding: 16px 0 14px 12px;
+ // }
+
+ // .line {
+ // height: 16px;
+ // background: #f5f5f5;
+ // }
+
+ // .peopleCard {
+ // background: #fff;
+ // .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;
+ // }
+ // }
+ // }
+ // }
+ // }
}
.currentTabBar2 {
diff --git a/src/apps/AppResidentFile/components/document.vue b/src/apps/AppResidentFile/components/document.vue
new file mode 100644
index 00000000..acb50061
--- /dev/null
+++ b/src/apps/AppResidentFile/components/document.vue
@@ -0,0 +1,129 @@
+
+
+
+
+
{{ $dict.getLabel("sex", resident.sex) || "-" }}
+
{{ resident.birthDate }}
+
{{ resident.age }}
+
{{ resident.birthplaceAreaName }}
+
{{ $dict.getLabel("nation", resident.nation) || "-" }}
+
{{ $dict.getLabel("education", resident.education) || "-" }}
+
{{ $dict.getLabel("militaryStatus", resident.militaryStatus) || "-" }}
+
{{ $dict.getLabel("politicsStatus", resident.politicsStatus) || "-" }}
+
{{ $dict.getLabel("job", resident.job) || "-" }}
+
{{ $dict.getLabel("faithType", resident.faithType) || "-" }}
+
+
+
+
{{ resident.phone }}
+
{{ resident.currentAreaName + resident.currentAddress }}
+
+
+
+
{{ $dict.getLabel("householdName", resident.householdName) || "-" }}
+
{{ $dict.getLabel("householdRelation", resident.householdRelation) || "-" }}
+
{{ resident.householdAreaName + resident.householdAddress }}
+
+
+
+
+
+
+
+
diff --git a/src/apps/AppResidentFile/components/info.vue b/src/apps/AppResidentFile/components/info.vue
new file mode 100644
index 00000000..1ba02802
--- /dev/null
+++ b/src/apps/AppResidentFile/components/info.vue
@@ -0,0 +1,353 @@
+
+
+
+
+
+
+
{{ top.detail.name }}
+
@微信
+
@企业微信
+
+
{{ !isCert ? "实名认证" : "解绑" }}
+
+
+ {{ $dict.getLabel("wxCustomerAddWay", top.detail.addWay) }}
+ {{ top.detail.createTime }}
+ {{ top.detail.realName }}
+ {{ resident.phone || "-" }}
+ {{ resident.familyIntegral }}
+ {{ resident.personalIntegral }}
+
+
+
+
+
+
+
+
+ {{ tag }}
+
+
+
+
+
+
+
+
+
+
{{ $dict.getLabel('wxCustomerLogType', item.type) }}
+
{{ item.createTime }}
+
+
+
+
+
+
+
+
+
+ 微信联系
+ 电话联系
+
+
+
+
+
+
+
diff --git a/src/apps/AppResidentFile/resident.vue b/src/apps/AppResidentFile/resident.vue
new file mode 100644
index 00000000..14b8670c
--- /dev/null
+++ b/src/apps/AppResidentFile/resident.vue
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+