diff --git a/src/apps/AppResidentActivitie/AddPosts.vue b/src/apps/AppResidentActivitie/AddPosts.vue
new file mode 100644
index 00000000..b56cda3d
--- /dev/null
+++ b/src/apps/AppResidentActivitie/AddPosts.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
diff --git a/src/apps/AppResidentActivitie/Detail.vue b/src/apps/AppResidentActivitie/Detail.vue
index f409bf37..cd8039a9 100644
--- a/src/apps/AppResidentActivitie/Detail.vue
+++ b/src/apps/AppResidentActivitie/Detail.vue
@@ -2,7 +2,7 @@
@@ -140,6 +140,10 @@ export default {
this.$dict.load(['villageActivityStatus']).then(() => {
this.getDetail()
})
+
+ uni.$on('refresh', () => {
+ this.getListInit()
+ })
},
methods: {
getDetail() {
@@ -154,32 +158,43 @@ export default {
console.log(this.detail.url)
}
}
- this.getActiveList()
}
})
},
+ getListInit() {
+ this.current == 1
+ this.getActiveList()
+ },
+
getActiveList() {
this.$http.post(`/app/apppostinfo/list?activityId=${this.id}`).then((res) => {
if (res?.data) {
- // this.activeList = res.data.records
- // if (this.activeList) {
- // let imagesList = []
- // this.activeList.map((item) => {
- // if (item.images) {
- // item.images = JSON.parse(item.images || '[]')
- // imagesList.push(item.images)
- // }
- // return item
- // })
- // this.imgList = imagesList
- // }
+ this.activeList = res.data.records
+ if (this.activeList) {
+ let imagesList = []
+ this.activeList.map((item) => {
+ if (item.images) {
+ item.images = JSON.parse(item.images || '[]')
+ imagesList.push(item.images)
+ }
+ return item
+ })
+ this.imgList = imagesList
+ }
}
})
},
change(index) {
this.current = index
+ if (this.current == 1) {
+ this.getActiveList()
+ }
+ },
+
+ AddPosts() {
+ uni.navigateTo({ url: `./AddPosts` })
},
previewImage(images, img) {
@@ -414,63 +429,21 @@ export default {
}
}
- .addicon {
- position: fixed;
- bottom: 280px;
- right: 30px;
- background: #fefefe;
- box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
- border-radius: 50%;
- padding: 26px 24px 22px 24px;
- }
-
- .btn {
- position: fixed;
- bottom: 0;
- width: 100%;
- // height: 112px;
- background: #f3f6f9;
-
- display: flex;
- justify-content: space-between;
- padding: 32px 0;
- text-align: center;
- .edit {
- width: 254px;
- height: 92px;
- line-height: 92px;
- background: #ffffff;
- border-radius: 8px;
- border: 2px solid #3671ee;
-
- font-size: 34px;
- font-weight: 500;
- color: #3671ee;
- margin-left: 32px;
- }
-
- .public {
- width: 400px;
-
- line-height: 92px;
- border-radius: 8px;
- font-size: 34px;
- font-weight: 500;
- color: #ffffff;
- margin-right: 32px;
- }
-
- .max {
- margin: 0 auto;
- width: 686px;
- height: 92px;
- line-height: 92px;
- background: #cbddf9;
- border-radius: 8px;
-
- font-size: 34px;
- font-weight: 500;
- color: #ffffff;
+ .AiFixedBtn {
+ .movableArea {
+ .addBtn {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 96px;
+ height: 96px;
+ flex-shrink: 0;
+ background: #fff;
+ box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2);
+ font-size: 48px;
+ color: #1365dd;
+ border-radius: 50%;
+ }
}
}
}
diff --git a/src/apps/AppResidentFile/DetailCard.vue b/src/apps/AppResidentFile/DetailCard.vue
deleted file mode 100644
index 4e7ae0fa..00000000
--- a/src/apps/AppResidentFile/DetailCard.vue
+++ /dev/null
@@ -1,193 +0,0 @@
-
-
-
-
-
-
家庭地址
-
-
-
- {{ currentAreaName }}
-
-
-
-
-
家庭成员
-
-
-
-
-
![]()
-

-
-
-
-
-
- {{ item.name }}
- 户主
-
- {{ $dict.getLabel('householdRelation', item.householdName) }}
-
-
-
-
-
-
-
-
-
- 身份证号:
- {{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/apps/AppResidentFile/DetailPeople.vue b/src/apps/AppResidentFile/DetailPeople.vue
deleted file mode 100644
index 79d164dd..00000000
--- a/src/apps/AppResidentFile/DetailPeople.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-
-
-
-
-
![]()
-

-
-
-
-
- {{ data.resident.name }}
-
- 户主
-
- {{ $dict.getLabel('householdRelation', data.resident.householdName) }}
-
-
-
-
{{ data.resident.phone }}
-
-
-
-
-
-
-
个人基本信息
-
-
-
- 家庭地址
- {{ data.resident.birthplaceAreaName }}
-
-
-
- 身份证号
- {{ data.resident.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}
-
-
-
- 民族
- {{ $dict.getLabel('nation', data.resident.householdName) }}
-
-
-
- 文化程度
- {{ $dict.getLabel('education', data.resident.education) }}
-
-
-
- 婚姻状况
- {{ $dict.getLabel('maritalStatus', data.resident.maritalStatus) }}
-
-
-
- 政治面貌
- {{ $dict.getLabel('politicsStatus', data.resident.politicsStatus) }}
-
-
-
- 兵役状况
- {{ $dict.getLabel('militaryStatus', data.resident.militaryStatus) }}
-
-
-
- 宗教信仰
- {{ $dict.getLabel('faithType', data.resident.faithType) }}
-
-
-
- 职业
- {{ $dict.getLabel('job', data.resident.job) }}
-
-
-
-
-
-
-
-
联络信息
-
-
-
- 联系方式
- {{ data.resident.phone }}
-
-
-
- 现住址
- {{ data.resident.currentAreaName }}
-
-
-
- 现住详细地址
- {{ data.resident.currentAddress }}
-
-
-
- 户籍地址
- {{ data.resident.householdAreaName }}
-
-
-
- 户籍详细地址
- {{ data.resident.householdAddress }}
-
-
-
-
-
-
-
-
-