From 2ca1feb92b73d007e8a6d0ffcff852d91c9c21d9 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: Tue, 4 Jan 2022 16:05:21 +0800
Subject: [PATCH 1/8] 26329
---
src/apps/AppUniMsg/AppUniMsg.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/apps/AppUniMsg/AppUniMsg.vue b/src/apps/AppUniMsg/AppUniMsg.vue
index fa93cf94..7c81d6e7 100644
--- a/src/apps/AppUniMsg/AppUniMsg.vue
+++ b/src/apps/AppUniMsg/AppUniMsg.vue
@@ -145,6 +145,7 @@ export default {
},
change(index) {
+ this.datas = []
this.currentTabs = index
this.getList()
},
From c1505c6dd16e4647f23ccb4a4b924899da61956f 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: Tue, 4 Jan 2022 16:06:12 +0800
Subject: [PATCH 2/8] 26298
---
src/apps/AppUniMsg/Detail.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/apps/AppUniMsg/Detail.vue b/src/apps/AppUniMsg/Detail.vue
index 1ea29dac..794796e7 100644
--- a/src/apps/AppUniMsg/Detail.vue
+++ b/src/apps/AppUniMsg/Detail.vue
@@ -33,7 +33,7 @@ export default {
computed: {},
watch: {},
onLoad(o) {
- document.title = '公告详情'
+ document.title = '小程序公告详情'
this.id = o.id
this.getDetail()
},
From eb9fc9fa5cbb0e2c974df09178338e1d2f66cc39 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: Tue, 4 Jan 2022 16:20:46 +0800
Subject: [PATCH 3/8] 26331
---
src/apps/AppWorkonline/Opinion.vue | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/apps/AppWorkonline/Opinion.vue b/src/apps/AppWorkonline/Opinion.vue
index 2a35034e..3eb40c8d 100644
--- a/src/apps/AppWorkonline/Opinion.vue
+++ b/src/apps/AppWorkonline/Opinion.vue
@@ -65,8 +65,8 @@
图片资料
(最多9张)
-
-
+
+
(picture = v)" :limit="9" action="/admin/file/add2" preview />
@@ -324,7 +324,11 @@ export default {
::v-deep .info > span {
width: 380px;
text-align: left;
- // word-break: break-all;
+ word-break: break-all;
+
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
::v-deep .ai-uploader .fileList .default {
@@ -352,13 +356,13 @@ export default {
margin-left: 10px;
}
- .upload {
+ .uploads {
width: 100%;
margin-top: 10px;
padding: 12px 12px 12px 0;
box-sizing: border-box;
- .info {
+ .infos {
width: 100%;
text-align: center;
}
From 6e529abfd721529074933c3912f5aba9d4254ddc Mon Sep 17 00:00:00 2001
From: aixianling
Date: Tue, 4 Jan 2022 17:17:44 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=B0=83=E6=95=B4?=
=?UTF-8?q?=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/apps/AppCountryAlbum/AppCountryAlbum.vue | 138 +++++++++++++++----
src/apps/AppCountryAlbum/detail.vue | 11 +-
src/apps/AppCountryAlbum/list.vue | 129 -----------------
3 files changed, 115 insertions(+), 163 deletions(-)
delete mode 100644 src/apps/AppCountryAlbum/list.vue
diff --git a/src/apps/AppCountryAlbum/AppCountryAlbum.vue b/src/apps/AppCountryAlbum/AppCountryAlbum.vue
index d5fb1694..d68a78da 100644
--- a/src/apps/AppCountryAlbum/AppCountryAlbum.vue
+++ b/src/apps/AppCountryAlbum/AppCountryAlbum.vue
@@ -1,51 +1,137 @@
-
+
+
+
+
+
+ {{ areaName }}
+ 请选择
+
+
+
+
+
+
+
![]()
+
{{ item.name }}
+
共{{ item.total }}张
+
+
+
+
+
diff --git a/src/apps/AppCountryAlbum/detail.vue b/src/apps/AppCountryAlbum/detail.vue
index d56be08d..f0bb58d1 100644
--- a/src/apps/AppCountryAlbum/detail.vue
+++ b/src/apps/AppCountryAlbum/detail.vue
@@ -40,7 +40,7 @@
-
+
@@ -64,14 +64,12 @@ export default {
computed: { ...mapState(['user']) },
onLoad(option) {
this.params = option
- console.log(this.params)
this.getList()
this.getStatistic()
},
onShow() {
document.title = "乡村相册"
},
-
methods: {
delConfirm() {
if(!this.delIds.length) {
@@ -86,7 +84,6 @@ export default {
this.getList()
this.getStatistic()
this.editClick('取消')
- uni.$emit('updateList')
}
})
})
@@ -197,7 +194,6 @@ export default {
})
},
confirmUpload() {
- console.log(this.fileList)
var urlList = []
this.fileList.map((item) => {
urlList.push(item.url)
@@ -211,7 +207,6 @@ export default {
this.$u.toast('上传成功!')
this.getList()
this.getStatistic()
- uni.$emit('updateList')
}
})
}
@@ -343,7 +338,7 @@ export default {
height: 112px;
line-height: 112px;
background: #3975C6;
- box-shadow: 0px 1px 0px 0px #EEEEEE;
+ box-shadow: 0 1px 0 0 #EEEEEE;
position: fixed;
bottom: 0;
left: 0;
@@ -354,4 +349,4 @@ export default {
z-index: 999;
}
}
-
\ No newline at end of file
+
diff --git a/src/apps/AppCountryAlbum/list.vue b/src/apps/AppCountryAlbum/list.vue
deleted file mode 100644
index 67088bb8..00000000
--- a/src/apps/AppCountryAlbum/list.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-
-
-
-
- {{ areaName }}
- 请选择
-
-
-
-
-
-
-
![]()
-
{{item.name}}
-
共{{item.total}}张
-
-
-
-
-
-
-
-
-
-
From 95f304e9ce97360b97d98380ce11646e3bbba436 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: Tue, 4 Jan 2022 17:56:04 +0800
Subject: [PATCH 5/8] 26329
---
.../AppResidentActivitie/AppResidentActivities.vue | 3 ++-
src/apps/AppUniMsg/AppUniMsg.vue | 11 +----------
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/apps/AppResidentActivitie/AppResidentActivities.vue b/src/apps/AppResidentActivitie/AppResidentActivities.vue
index e1a1505c..33b31b68 100644
--- a/src/apps/AppResidentActivitie/AppResidentActivities.vue
+++ b/src/apps/AppResidentActivitie/AppResidentActivities.vue
@@ -32,7 +32,7 @@
{{ item.areaName }}{{ item.address }}
-
+
{{ $dict.getLabel('villageActivityStatus', item.status) }}
@@ -103,6 +103,7 @@ export default {
.then((res) => {
if (res.code == 0) {
this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+
this.total = res.data.total
this.pages = res.data.pages
}
diff --git a/src/apps/AppUniMsg/AppUniMsg.vue b/src/apps/AppUniMsg/AppUniMsg.vue
index 7c81d6e7..b78ec839 100644
--- a/src/apps/AppUniMsg/AppUniMsg.vue
+++ b/src/apps/AppUniMsg/AppUniMsg.vue
@@ -20,7 +20,7 @@
-
![]()
+
@@ -100,15 +100,6 @@ export default {
.then((res) => {
if (res.code == 0) {
this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
- if (this.datas) {
- this.datas.map((item) => {
- if (item.images) {
- item.images = JSON.parse(item.images || '[]')
- }
- return item
- })
- }
-
this.pages = res.data.pages
}
})
From 3d0b9898b050b02ab2c5f4a07cb5f05e77ce749d 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: Tue, 4 Jan 2022 18:07:38 +0800
Subject: [PATCH 6/8] =?UTF-8?q?img=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/apps/AppWalkask/AppWalkask.vue | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue
index 63d90c02..01b47f91 100644
--- a/src/apps/AppWalkask/AppWalkask.vue
+++ b/src/apps/AppWalkask/AppWalkask.vue
@@ -32,7 +32,7 @@
{{ item.title }}
-
![]()
+
@@ -138,15 +138,6 @@ export default {
}
this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
this.pages = res.data.pages
-
- if (this.data) {
- this.data.map((item) => {
- if (item.images) {
- item.images = JSON.parse(item.images || '[]')
- }
- return item
- })
- }
}
})
},
From dc13bea104f8d9ca610852025b89aaed470f3677 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: Wed, 5 Jan 2022 09:50:43 +0800
Subject: [PATCH 7/8] 26329
---
src/apps/AppUniMsg/AppUniMsg.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/apps/AppUniMsg/AppUniMsg.vue b/src/apps/AppUniMsg/AppUniMsg.vue
index b78ec839..2d7bcdd8 100644
--- a/src/apps/AppUniMsg/AppUniMsg.vue
+++ b/src/apps/AppUniMsg/AppUniMsg.vue
@@ -137,6 +137,7 @@ export default {
change(index) {
this.datas = []
+ this.current = 1
this.currentTabs = index
this.getList()
},
From 63d9f51b4595988cc0d31177451feea27aed9881 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: Wed, 5 Jan 2022 09:56:50 +0800
Subject: [PATCH 8/8] delete
---
src/apps/AppWalkask/add.vue | 16 +-
src/apps/AppWalkask/walkObject.vue | 671 -----------------------------
2 files changed, 1 insertion(+), 686 deletions(-)
delete mode 100644 src/apps/AppWalkask/walkObject.vue
diff --git a/src/apps/AppWalkask/add.vue b/src/apps/AppWalkask/add.vue
index 35dbdef3..8fc405d9 100644
--- a/src/apps/AppWalkask/add.vue
+++ b/src/apps/AppWalkask/add.vue
@@ -47,21 +47,15 @@
保存
-
-
-
-