- ![]()
+ ![]()
@@ -10,7 +10,7 @@
![]()
@@ -20,7 +20,7 @@
-
{{ $dict.getLabel('newActivityStatus', detail.status) }}
+ {{ $dict.getLabel('villageActivityStatus', detail.status) }}
活动时间
- {{ detail.beginTime }}-{{ detail.endTime }}
+ {{ detail.beginTime && detail.beginTime.substring(0, detail.beginTime.length - 2) }}
@@ -54,7 +54,7 @@
-
+
![]()
@@ -103,47 +103,9 @@
-
-
-
-
-
+
+
+
@@ -173,18 +135,25 @@ export default {
}
},
onLoad(option) {
+ console.log(option)
this.id = option.id
- this.$dict.load(['newActivityStatus']).then(() => {
+ this.$dict.load(['villageActivityStatus']).then(() => {
this.getDetail()
})
},
methods: {
getDetail() {
- this.$http.post(`/app/appactivityinfo/queryDetailById?id=${this.id}&partyId=${this.user.partyId}`).then((res) => {
+ this.$http.post(`/app/appvillageactivityinfo/queryDetailById?id=${this.id}`).then((res) => {
if (res?.data) {
- res.data.beginTime = res.data.beginTime.substring(0, 16)
- res.data.endTime = res.data.endTime.substring(0, 16)
+ // res.data.beginTime = res.data.beginTime.substring(0, 16)
+ // res.data.endTime = res.data.endTime.substring(0, 16)
this.detail = res.data
+ if (this.detail) {
+ if (this.detail.url) {
+ this.detail.url = JSON.parse(res.data.url || '[]')
+ console.log(this.detail.url)
+ }
+ }
this.getActiveList()
}
})
@@ -193,19 +162,18 @@ export default {
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
+ // }
}
})
},
@@ -214,104 +182,6 @@ export default {
this.current = index
},
- toPublicPage() {
- uni.navigateTo({
- url: `./AddPosts?id=${this.id}`,
- })
- },
-
- editActive() {
- uni.navigateTo({ url: `./Add?id=${this.id}` })
- },
- changeStatus(status, text) {
- uni.showModal({
- title: '提示',
- content: `${text}`,
- confirmText: '确定',
- success: (e) => {
- if (status == 1) {
- //发布
- this.changeStatusConfirm(status)
- }
- if (status == 2) {
- //报名
- this.report()
- }
- if (status == 3) {
- //取消报名
- this.cancelReport()
- }
- },
- })
- },
- cancelReport() {
- this.$instance
- .post(`/app/appactivityuser/removeReport`, {
- activityId: this.id,
- partyId: this.user.partyId,
- })
- .then((res) => {
- if (res.code == 0) {
- this.$toast('提交成功')
- this.getDetail()
- }
- })
- },
- changeStatusConfirm(status) {
- this.$instance
- .post(`/app/appactivityinfo/changeStatus`, {
- id: this.id,
- status: status,
- })
- .then((res) => {
- if (res.code == 0) {
- this.$toast('提交成功')
- this.getDetail()
- }
- })
- },
- callPhone(phone) {
- uni.makePhoneCall({ phoneNumber: phone })
- },
- report() {
- this.$instance
- .post(`/app/appactivityuser/report`, {
- activityId: this.id,
- partyId: this.user.partyId,
- name: this.user.realName,
- orgId: this.user.partyOrgId,
- orgName: this.user.partyOrgName,
- phone: this.user.phone,
- communityId: this.user.communityId,
- })
- .then((res) => {
- if (res.code == 0) {
- this.$toast('报名成功')
- this.getDetail()
- }
- })
- },
- toSignUser() {
- var isAdmin = this.detail.createUserId == this.user.partyId ? 1 : 0
- uni.navigateTo({ url: `./SignUser?id=${this.id}&isAdmin=${isAdmin}&status=${this.detail.status}` })
- },
- sign(status) {
- //status 0开始签到 1离场签到
- this.$instance
- .post(`/app/appactivityuser/sign`, {
- activityId: this.id,
- partyId: this.user.partyId,
- })
- .then((res) => {
- if (res.code == 0) {
- this.$toast(status == 1 ? '离场签到成功' : '签到成功')
- this.getDetail()
- }
- })
- },
- toDetail(id) {
- this.linkTo(`./detail?id=${id}`)
- },
previewImage(images, img) {
uni.previewImage({
urls: images.map((v) => v.url),
diff --git a/src/apps/AppResidentFile/AppResidentFile.vue b/src/apps/AppResidentFile/AppResidentFile.vue
index d7203b1f..0335b9a1 100644
--- a/src/apps/AppResidentFile/AppResidentFile.vue
+++ b/src/apps/AppResidentFile/AppResidentFile.vue
@@ -200,8 +200,8 @@ export default {
},
watch: {},
onLoad(o) {
- if (o.index) {
- this.indexBar = o.index
+ if (o.tabIndex) {
+ this.indexBar = o.tabIndex
}
this.getEchart1()
this.getEchart2()