From a6feb5a637709475aa2996316ed94c79d52aab7a Mon Sep 17 00:00:00 2001 From: aixianling Date: Fri, 13 May 2022 15:41:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppIntegralAudit/AppIntegralAudit.vue | 0 .../AppIntegralAudit/detail.vue | 20 +++++++++--------- .../AppIntegralAudit/img/address.png | Bin 3 files changed, 10 insertions(+), 10 deletions(-) rename src/{apps => project/shandong10086}/AppIntegralAudit/AppIntegralAudit.vue (100%) rename src/{apps => project/shandong10086}/AppIntegralAudit/detail.vue (98%) rename src/{apps => project/shandong10086}/AppIntegralAudit/img/address.png (100%) diff --git a/src/apps/AppIntegralAudit/AppIntegralAudit.vue b/src/project/shandong10086/AppIntegralAudit/AppIntegralAudit.vue similarity index 100% rename from src/apps/AppIntegralAudit/AppIntegralAudit.vue rename to src/project/shandong10086/AppIntegralAudit/AppIntegralAudit.vue diff --git a/src/apps/AppIntegralAudit/detail.vue b/src/project/shandong10086/AppIntegralAudit/detail.vue similarity index 98% rename from src/apps/AppIntegralAudit/detail.vue rename to src/project/shandong10086/AppIntegralAudit/detail.vue index 69ff2039..41643455 100644 --- a/src/apps/AppIntegralAudit/detail.vue +++ b/src/project/shandong10086/AppIntegralAudit/detail.vue @@ -8,7 +8,7 @@
{{ form.createTime }}
- + {{ form.areaName }}
@@ -54,7 +54,7 @@
*不通过理由
-
{{ data.auditOpinion.length }}/500
@@ -70,7 +70,7 @@
-
+
积分审核
通过
@@ -228,7 +228,7 @@ export default { onShow() { document.title = '积分审核详情' }, - + } @@ -289,7 +289,7 @@ export default { } .detail-img { - + img { width: 220px; height: 220px; @@ -303,7 +303,7 @@ export default { .integral { font-size: 32px; - + .result { padding: 20px 30px; box-sizing: border-box; @@ -313,7 +313,7 @@ export default { .options { display: flex; justify-content: space-between; - + .opts-item { width: 45%; height: 112px; @@ -418,7 +418,7 @@ export default { border-bottom: none; } } - + .saveBtn { position: fixed; bottom: 0; @@ -430,6 +430,6 @@ export default { color: #FFFFFF; text-align: center; } - + } - \ No newline at end of file + diff --git a/src/apps/AppIntegralAudit/img/address.png b/src/project/shandong10086/AppIntegralAudit/img/address.png similarity index 100% rename from src/apps/AppIntegralAudit/img/address.png rename to src/project/shandong10086/AppIntegralAudit/img/address.png From 79d19449a7373873a0a884d58a8ce6d1246a144d Mon Sep 17 00:00:00 2001 From: aixianling Date: Fri, 13 May 2022 15:43:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppVillagersCircle/AppVillagersCircle.vue | 0 .../AppVillagersCircle/Reject.vue | 0 .../AppVillagersCircle/commentDetail.vue | 10 +++++----- .../AppVillagersCircle/commentList.vue | 0 .../AppVillagersCircle/img/address.png | Bin .../AppVillagersCircle/img/blue.png | Bin .../AppVillagersCircle/img/green.png | Bin .../AppVillagersCircle/img/tx@2x.png | Bin .../AppVillagersCircle/infoDetail.vue | 18 +++++++++--------- .../AppVillagersCircle/infoList.vue | 0 10 files changed, 14 insertions(+), 14 deletions(-) rename src/{apps => project/shandong10086}/AppVillagersCircle/AppVillagersCircle.vue (100%) rename src/{apps => project/shandong10086}/AppVillagersCircle/Reject.vue (100%) rename src/{apps => project/shandong10086}/AppVillagersCircle/commentDetail.vue (98%) rename src/{apps => project/shandong10086}/AppVillagersCircle/commentList.vue (100%) rename src/{apps => project/shandong10086}/AppVillagersCircle/img/address.png (100%) rename src/{apps => project/shandong10086}/AppVillagersCircle/img/blue.png (100%) rename src/{apps => project/shandong10086}/AppVillagersCircle/img/green.png (100%) rename src/{apps => project/shandong10086}/AppVillagersCircle/img/tx@2x.png (100%) rename src/{apps => project/shandong10086}/AppVillagersCircle/infoDetail.vue (97%) rename src/{apps => project/shandong10086}/AppVillagersCircle/infoList.vue (100%) diff --git a/src/apps/AppVillagersCircle/AppVillagersCircle.vue b/src/project/shandong10086/AppVillagersCircle/AppVillagersCircle.vue similarity index 100% rename from src/apps/AppVillagersCircle/AppVillagersCircle.vue rename to src/project/shandong10086/AppVillagersCircle/AppVillagersCircle.vue diff --git a/src/apps/AppVillagersCircle/Reject.vue b/src/project/shandong10086/AppVillagersCircle/Reject.vue similarity index 100% rename from src/apps/AppVillagersCircle/Reject.vue rename to src/project/shandong10086/AppVillagersCircle/Reject.vue diff --git a/src/apps/AppVillagersCircle/commentDetail.vue b/src/project/shandong10086/AppVillagersCircle/commentDetail.vue similarity index 98% rename from src/apps/AppVillagersCircle/commentDetail.vue rename to src/project/shandong10086/AppVillagersCircle/commentDetail.vue index 166b166d..02920972 100644 --- a/src/apps/AppVillagersCircle/commentDetail.vue +++ b/src/project/shandong10086/AppVillagersCircle/commentDetail.vue @@ -3,7 +3,7 @@
- +
@@ -22,7 +22,7 @@
- + {{ data.villagerCircleInfo.gpsDesc }}
@@ -77,7 +77,7 @@
驳回发布
同意发布
- +
@@ -190,7 +190,7 @@ export default { border-radius: 28px; padding: 6px 20px; background: #EFF1F3; - + img { padding-top: 5px; width: 32px; @@ -278,4 +278,4 @@ export default { } } } - \ No newline at end of file + diff --git a/src/apps/AppVillagersCircle/commentList.vue b/src/project/shandong10086/AppVillagersCircle/commentList.vue similarity index 100% rename from src/apps/AppVillagersCircle/commentList.vue rename to src/project/shandong10086/AppVillagersCircle/commentList.vue diff --git a/src/apps/AppVillagersCircle/img/address.png b/src/project/shandong10086/AppVillagersCircle/img/address.png similarity index 100% rename from src/apps/AppVillagersCircle/img/address.png rename to src/project/shandong10086/AppVillagersCircle/img/address.png diff --git a/src/apps/AppVillagersCircle/img/blue.png b/src/project/shandong10086/AppVillagersCircle/img/blue.png similarity index 100% rename from src/apps/AppVillagersCircle/img/blue.png rename to src/project/shandong10086/AppVillagersCircle/img/blue.png diff --git a/src/apps/AppVillagersCircle/img/green.png b/src/project/shandong10086/AppVillagersCircle/img/green.png similarity index 100% rename from src/apps/AppVillagersCircle/img/green.png rename to src/project/shandong10086/AppVillagersCircle/img/green.png diff --git a/src/apps/AppVillagersCircle/img/tx@2x.png b/src/project/shandong10086/AppVillagersCircle/img/tx@2x.png similarity index 100% rename from src/apps/AppVillagersCircle/img/tx@2x.png rename to src/project/shandong10086/AppVillagersCircle/img/tx@2x.png diff --git a/src/apps/AppVillagersCircle/infoDetail.vue b/src/project/shandong10086/AppVillagersCircle/infoDetail.vue similarity index 97% rename from src/apps/AppVillagersCircle/infoDetail.vue rename to src/project/shandong10086/AppVillagersCircle/infoDetail.vue index 328dbeb4..3bed9a3d 100644 --- a/src/apps/AppVillagersCircle/infoDetail.vue +++ b/src/project/shandong10086/AppVillagersCircle/infoDetail.vue @@ -3,7 +3,7 @@
- +
@@ -22,7 +22,7 @@
- + {{ data.gpsDesc }}
@@ -41,7 +41,7 @@
{{ data.auditTime }}
- +
审核结果
@@ -67,7 +67,7 @@
驳回发布
同意发布
- +
@@ -181,7 +181,7 @@ export default { border-radius: 28px; padding: 6px 20px; background: #EFF1F3; - + img { padding-top: 5px; width: 32px; @@ -192,9 +192,9 @@ export default { vertical-align: top; } } - - - + + + } .comment { padding: 0 32px 30px 32px; @@ -271,4 +271,4 @@ export default { } } } - \ No newline at end of file + diff --git a/src/apps/AppVillagersCircle/infoList.vue b/src/project/shandong10086/AppVillagersCircle/infoList.vue similarity index 100% rename from src/apps/AppVillagersCircle/infoList.vue rename to src/project/shandong10086/AppVillagersCircle/infoList.vue From 22af238bfa67b8c492cf660515519bf903974968 Mon Sep 17 00:00:00 2001 From: aixianling Date: Fri, 13 May 2022 16:14:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=95=B4=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppIntegralAudit/AppIntegralAudit.vue | 0 .../AppIntegralAudit/detail.vue | 0 .../AppIntegralAudit/img/address.png | Bin 3 files changed, 0 insertions(+), 0 deletions(-) rename src/{project/shandong10086 => apps}/AppIntegralAudit/AppIntegralAudit.vue (100%) rename src/{project/shandong10086 => apps}/AppIntegralAudit/detail.vue (100%) rename src/{project/shandong10086 => apps}/AppIntegralAudit/img/address.png (100%) diff --git a/src/project/shandong10086/AppIntegralAudit/AppIntegralAudit.vue b/src/apps/AppIntegralAudit/AppIntegralAudit.vue similarity index 100% rename from src/project/shandong10086/AppIntegralAudit/AppIntegralAudit.vue rename to src/apps/AppIntegralAudit/AppIntegralAudit.vue diff --git a/src/project/shandong10086/AppIntegralAudit/detail.vue b/src/apps/AppIntegralAudit/detail.vue similarity index 100% rename from src/project/shandong10086/AppIntegralAudit/detail.vue rename to src/apps/AppIntegralAudit/detail.vue diff --git a/src/project/shandong10086/AppIntegralAudit/img/address.png b/src/apps/AppIntegralAudit/img/address.png similarity index 100% rename from src/project/shandong10086/AppIntegralAudit/img/address.png rename to src/apps/AppIntegralAudit/img/address.png From 00413f4484e58cfdf57a291d699e875673ebfadd Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 13 May 2022 16:18:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppIntegralAudit/AppIntegralAudit.vue | 6 ++--- .../shandong10086/AppIntegralAudit/detail.vue | 27 +++++++++++-------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/project/shandong10086/AppIntegralAudit/AppIntegralAudit.vue b/src/project/shandong10086/AppIntegralAudit/AppIntegralAudit.vue index 4c821df0..97b1d6f3 100644 --- a/src/project/shandong10086/AppIntegralAudit/AppIntegralAudit.vue +++ b/src/project/shandong10086/AppIntegralAudit/AppIntegralAudit.vue @@ -6,10 +6,10 @@
{{item}}
-
+
@@ -18,7 +18,7 @@
{{ item.description }}
-
{{ $dict.getLabel('atWillReportType',item.applyIntegralType) }}
+
{{ item.createTime }}
diff --git a/src/project/shandong10086/AppIntegralAudit/detail.vue b/src/project/shandong10086/AppIntegralAudit/detail.vue index 41643455..4472711f 100644 --- a/src/project/shandong10086/AppIntegralAudit/detail.vue +++ b/src/project/shandong10086/AppIntegralAudit/detail.vue @@ -32,7 +32,7 @@
-
+
-
积分调整
-
{{ data.integral }}
+
*积分调整
+
+ +
@@ -75,14 +77,14 @@
积分审核
通过
-
+
积分调整
{{ form.auditIntegral }}
@@ -194,11 +196,14 @@ export default { }, submit() { if(this.opts==1){ - if(!this.data.auditIntegralType) { - return this.$u.toast('请选择积分类别') - } - if(!this.data.ruleName) { - return this.$u.toast('请选择积分事项') + // if(!this.data.auditIntegralType) { + // return this.$u.toast('请选择积分类别') + // } + // if(!this.data.ruleName) { + // return this.$u.toast('请选择积分事项') + // } + if(!this.data.integral) { + return this.$u.toast('请输入积分调整') } } if(this.opts==0){