diff --git a/src/apps/AppIntegralAudit/AppIntegralAudit.vue b/src/apps/AppIntegralAudit/AppIntegralAudit.vue index 4c821df0..97b1d6f3 100644 --- a/src/apps/AppIntegralAudit/AppIntegralAudit.vue +++ b/src/apps/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/apps/AppIntegralAudit/detail.vue b/src/apps/AppIntegralAudit/detail.vue index 69ff2039..4472711f 100644 --- a/src/apps/AppIntegralAudit/detail.vue +++ b/src/apps/AppIntegralAudit/detail.vue @@ -8,7 +8,7 @@
{{ form.createTime }}
- + {{ form.areaName }}
@@ -32,7 +32,7 @@
-
+
-
积分调整
-
{{ data.integral }}
+
*积分调整
+
+ +
*不通过理由
-
{{ data.auditOpinion.length }}/500
@@ -70,19 +72,19 @@
-
+
积分审核
通过
-
+
积分调整
{{ 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){ @@ -228,7 +233,7 @@ export default { onShow() { document.title = '积分审核详情' }, - + } @@ -289,7 +294,7 @@ export default { } .detail-img { - + img { width: 220px; height: 220px; @@ -303,7 +308,7 @@ export default { .integral { font-size: 32px; - + .result { padding: 20px 30px; box-sizing: border-box; @@ -313,7 +318,7 @@ export default { .options { display: flex; justify-content: space-between; - + .opts-item { width: 45%; height: 112px; @@ -418,7 +423,7 @@ export default { border-bottom: none; } } - + .saveBtn { position: fixed; bottom: 0; @@ -430,6 +435,6 @@ export default { color: #FFFFFF; text-align: center; } - + } - \ No newline at end of file + 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