From d7dc29ce07aaf871a899cc44de55bbe3ca4c9ad9 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Tue, 15 Feb 2022 15:55:09 +0800 Subject: [PATCH 1/6] 27398 27373 --- .../AppVillagersCircle/AppVillagersCircle.vue | 220 ++++++++++++++++++ src/apps/AppVillagersCircle/detail.vue | 16 ++ src/apps/AppVillagersCircle/img/tx@2x.png | Bin 0 -> 3290 bytes src/saas/AppConflictMediation/detail.vue | 15 +- 4 files changed, 241 insertions(+), 10 deletions(-) create mode 100644 src/apps/AppVillagersCircle/AppVillagersCircle.vue create mode 100644 src/apps/AppVillagersCircle/detail.vue create mode 100644 src/apps/AppVillagersCircle/img/tx@2x.png diff --git a/src/apps/AppVillagersCircle/AppVillagersCircle.vue b/src/apps/AppVillagersCircle/AppVillagersCircle.vue new file mode 100644 index 00000000..1afc8069 --- /dev/null +++ b/src/apps/AppVillagersCircle/AppVillagersCircle.vue @@ -0,0 +1,220 @@ + + + + + diff --git a/src/apps/AppVillagersCircle/detail.vue b/src/apps/AppVillagersCircle/detail.vue new file mode 100644 index 00000000..70771791 --- /dev/null +++ b/src/apps/AppVillagersCircle/detail.vue @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/src/apps/AppVillagersCircle/img/tx@2x.png b/src/apps/AppVillagersCircle/img/tx@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..61c42ebb79cba6eb28e683ae4de1cdbbc0762b84 GIT binary patch literal 3290 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 Y0r{KtqJ&Z8zyJUM07*qoM6N<$g8$+}OaK4? literal 0 HcmV?d00001 diff --git a/src/saas/AppConflictMediation/detail.vue b/src/saas/AppConflictMediation/detail.vue index f17bede8..090353dd 100644 --- a/src/saas/AppConflictMediation/detail.vue +++ b/src/saas/AppConflictMediation/detail.vue @@ -55,9 +55,7 @@
- - -
+
@@ -65,8 +63,8 @@
- -
+ +
{{ $dict.getLabel('clapDoStatus', item.doStatus) }}
@@ -136,16 +134,13 @@ export default { }, methods: { transTxt(str){ - return str.replace(/\$(.+)\$/g,'') - }, - transAvatar(str){ - return str.replace(/\$(.+)\$.+/g,'') + return str.split("$") }, + getDetail() { this.$http.post(`/app/appclapeventinfo/queryDetailById?id=${this.id}`).then((res) => { if (res?.data) { this.data = res.data - console.log(this.data); this.showPage = true } }) From 479aa568dac397d9042e2674c4e870ccf6935bb8 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 15 Feb 2022 16:20:44 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{component => components}/img/line.png | Bin src/saas/AppGridManagement/Map.vue | 2 +- src/saas/AppGridManagement/Organization.vue | 5 ++++- 3 files changed, 5 insertions(+), 2 deletions(-) rename src/apps/AppCreditPoints/{component => components}/img/line.png (100%) diff --git a/src/apps/AppCreditPoints/component/img/line.png b/src/apps/AppCreditPoints/components/img/line.png similarity index 100% rename from src/apps/AppCreditPoints/component/img/line.png rename to src/apps/AppCreditPoints/components/img/line.png diff --git a/src/saas/AppGridManagement/Map.vue b/src/saas/AppGridManagement/Map.vue index 6cec3582..d89a221f 100644 --- a/src/saas/AppGridManagement/Map.vue +++ b/src/saas/AppGridManagement/Map.vue @@ -36,7 +36,7 @@
- 网格管理员 + 网格员 +
+
+
雷洋
+
+ 美丽庭院 + 2020-10-28 12:30 +
+
+
⾦秋穿上⽑⾐，漫步森林，在阳光下呼吸伸展，⾃在安逸的天⼈。也许是兰天名字的由来吧。
@@ -24,6 +35,38 @@ export default { \ No newline at end of file diff --git a/src/saas/AppConflictMediation/detail.vue b/src/saas/AppConflictMediation/detail.vue index 705abe14..b841d40e 100644 --- a/src/saas/AppConflictMediation/detail.vue +++ b/src/saas/AppConflictMediation/detail.vue @@ -7,7 +7,7 @@
-
的上报
+
的上报
{{ data.createTime }}
@@ -63,7 +63,7 @@
- +
{{ $dict.getLabel('clapDoStatus', item.doStatus) }} From 1c1bb999a4aae64c97098e154da86278e2bbc74c Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 15 Feb 2022 17:07:05 +0800 Subject: [PATCH 5/6] =?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/saas/AppAskForm/PreviewForm.vue | 2 +- src/saas/AppAskForm/components/List.vue | 2 +- src/saas/AppGridManagement/Organization.vue | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/saas/AppAskForm/PreviewForm.vue b/src/saas/AppAskForm/PreviewForm.vue index 1e5553fd..6927560f 100644 --- a/src/saas/AppAskForm/PreviewForm.vue +++ b/src/saas/AppAskForm/PreviewForm.vue @@ -46,7 +46,7 @@
- 选择图片（2M以内） + 选择图片（10M以内）