diff --git a/src/apps/AppCreditPoints/AppCreditPoints.vue b/src/apps/AppCreditPoints/AppCreditPoints.vue index 4a9b8b94..2ed195af 100644 --- a/src/apps/AppCreditPoints/AppCreditPoints.vue +++ b/src/apps/AppCreditPoints/AppCreditPoints.vue @@ -1,462 +1,59 @@ diff --git a/src/apps/AppCreditPoints/components/familyRank.vue b/src/apps/AppCreditPoints/components/familyRank.vue new file mode 100644 index 00000000..3c58af07 --- /dev/null +++ b/src/apps/AppCreditPoints/components/familyRank.vue @@ -0,0 +1,390 @@ + + + diff --git a/src/apps/AppCreditPoints/components/img/line.png b/src/apps/AppCreditPoints/components/img/line.png deleted file mode 100644 index bde78ee8..00000000 Binary files a/src/apps/AppCreditPoints/components/img/line.png and /dev/null differ diff --git a/src/apps/AppCreditPoints/components/sysUserIntegral.vue b/src/apps/AppCreditPoints/components/sysUserIntegral.vue new file mode 100644 index 00000000..a469de8e --- /dev/null +++ b/src/apps/AppCreditPoints/components/sysUserIntegral.vue @@ -0,0 +1,216 @@ + + + diff --git a/src/apps/AppCreditPoints/components/userRank.vue b/src/apps/AppCreditPoints/components/userRank.vue new file mode 100644 index 00000000..2ac54549 --- /dev/null +++ b/src/apps/AppCreditPoints/components/userRank.vue @@ -0,0 +1,395 @@ + + + diff --git a/src/apps/AppCreditPoints/giveIntegral.vue b/src/apps/AppCreditPoints/giveIntegral.vue new file mode 100644 index 00000000..deaef0ed --- /dev/null +++ b/src/apps/AppCreditPoints/giveIntegral.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/src/apps/AppHandSnapshot/Detail.vue b/src/apps/AppHandSnapshot/Detail.vue index 827c353d..2de9cb91 100644 --- a/src/apps/AppHandSnapshot/Detail.vue +++ b/src/apps/AppHandSnapshot/Detail.vue @@ -71,7 +71,7 @@ {{ item.girdMemberName && item.girdMemberName.substring(item.girdMemberName.length, item.girdMemberName.length - 2) }} - +
@@ -102,12 +102,12 @@
- + 转交事件
- + 拒绝受理
@@ -198,7 +198,7 @@ uni-page-body { width: 80px; height: 80px; line-height: 80px; - background: #4e8eee; + background: #3975c6; border-radius: 50%; color: #fff; text-align: center; diff --git a/src/apps/AppHelpDeclaration/SelectUser.vue b/src/apps/AppHelpDeclaration/SelectUser.vue new file mode 100644 index 00000000..0389c29f --- /dev/null +++ b/src/apps/AppHelpDeclaration/SelectUser.vue @@ -0,0 +1,339 @@ + + + + + diff --git a/src/apps/AppHelpDeclaration/add.vue b/src/apps/AppHelpDeclaration/add.vue index 1170e9d2..9408b7fc 100644 --- a/src/apps/AppHelpDeclaration/add.vue +++ b/src/apps/AppHelpDeclaration/add.vue @@ -160,7 +160,11 @@ export default { this.flag = true this.$http.post('/app/apphelpdeclarationinfo/addByEw',{...this.form}).then((res) => { if(res.code ==0) { - uni.navigateTo({url: './result'}) + this.$u.toast('提交成功') + uni.$emit('update') + setTimeout(() => { + uni.navigateBack() + },600) } }) } diff --git a/src/apps/AppHelpDeclaration/components/1.png b/src/apps/AppHelpDeclaration/components/1.png new file mode 100644 index 00000000..663b9263 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/1.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/add-icon.png b/src/apps/AppHelpDeclaration/components/img/add-icon.png new file mode 100644 index 00000000..f751a7fa Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/add-icon.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/bg-1.png b/src/apps/AppHelpDeclaration/components/img/bg-1.png new file mode 100644 index 00000000..696022e9 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/bg-1.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/bg-2.png b/src/apps/AppHelpDeclaration/components/img/bg-2.png new file mode 100644 index 00000000..98fa31b8 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/bg-2.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/bg-3.png b/src/apps/AppHelpDeclaration/components/img/bg-3.png new file mode 100644 index 00000000..dc469567 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/bg-3.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/down-icon.png b/src/apps/AppHelpDeclaration/components/img/down-icon.png new file mode 100644 index 00000000..6ffcc7a2 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/down-icon.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/gird--select-icon.png b/src/apps/AppHelpDeclaration/components/img/gird--select-icon.png new file mode 100644 index 00000000..205144d2 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/gird--select-icon.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/gird-icon.png b/src/apps/AppHelpDeclaration/components/img/gird-icon.png new file mode 100644 index 00000000..f7f3e61f Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/gird-icon.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/handle-icon-active.png b/src/apps/AppHelpDeclaration/components/img/handle-icon-active.png new file mode 100644 index 00000000..1cb07503 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/handle-icon-active.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/handle-icon.png b/src/apps/AppHelpDeclaration/components/img/handle-icon.png new file mode 100644 index 00000000..ab2d20c2 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/handle-icon.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/jujue.png b/src/apps/AppHelpDeclaration/components/img/jujue.png new file mode 100644 index 00000000..ea7387ad Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/jujue.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/line-img.png b/src/apps/AppHelpDeclaration/components/img/line-img.png new file mode 100644 index 00000000..4d423855 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/line-img.png differ diff --git a/src/apps/AppCreditPoints/components/img/local-icon.png b/src/apps/AppHelpDeclaration/components/img/local-icon.png similarity index 100% rename from src/apps/AppCreditPoints/components/img/local-icon.png rename to src/apps/AppHelpDeclaration/components/img/local-icon.png diff --git a/src/apps/AppHelpDeclaration/components/img/no-admin.png b/src/apps/AppHelpDeclaration/components/img/no-admin.png new file mode 100644 index 00000000..3830c170 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/no-admin.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/remove-icon.png b/src/apps/AppHelpDeclaration/components/img/remove-icon.png new file mode 100644 index 00000000..971b39ef Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/remove-icon.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/right-icon.png b/src/apps/AppHelpDeclaration/components/img/right-icon.png new file mode 100644 index 00000000..e1c626b7 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/right-icon.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/search-icon.png b/src/apps/AppHelpDeclaration/components/img/search-icon.png new file mode 100644 index 00000000..e3cb75af Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/search-icon.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/set-icon-active.png b/src/apps/AppHelpDeclaration/components/img/set-icon-active.png new file mode 100644 index 00000000..c025cb79 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/set-icon-active.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/set-icon.png b/src/apps/AppHelpDeclaration/components/img/set-icon.png new file mode 100644 index 00000000..58651b64 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/set-icon.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/setting-icon.png b/src/apps/AppHelpDeclaration/components/img/setting-icon.png new file mode 100644 index 00000000..29e4b29f Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/setting-icon.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/statistics-icon-active.png b/src/apps/AppHelpDeclaration/components/img/statistics-icon-active.png new file mode 100644 index 00000000..81dbd3f7 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/statistics-icon-active.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/statistics-icon.png b/src/apps/AppHelpDeclaration/components/img/statistics-icon.png new file mode 100644 index 00000000..63b98d33 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/statistics-icon.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/tx@2x.png b/src/apps/AppHelpDeclaration/components/img/tx@2x.png new file mode 100644 index 00000000..d9620e08 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/tx@2x.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/user-img.png b/src/apps/AppHelpDeclaration/components/img/user-img.png new file mode 100644 index 00000000..ae49d85f Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/user-img.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/xz.png b/src/apps/AppHelpDeclaration/components/img/xz.png new file mode 100644 index 00000000..98f78cda Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/xz.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/xzh.png b/src/apps/AppHelpDeclaration/components/img/xzh.png new file mode 100644 index 00000000..967fa399 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/xzh.png differ diff --git a/src/apps/AppHelpDeclaration/components/img/zhuanjiao.png b/src/apps/AppHelpDeclaration/components/img/zhuanjiao.png new file mode 100644 index 00000000..f6c932fa Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/zhuanjiao.png differ diff --git a/src/apps/AppHelpDeclaration/components/resultPic.png b/src/apps/AppHelpDeclaration/components/resultPic.png deleted file mode 100644 index e1a43aff..00000000 Binary files a/src/apps/AppHelpDeclaration/components/resultPic.png and /dev/null differ diff --git a/src/apps/AppHelpDeclaration/components/tab.png b/src/apps/AppHelpDeclaration/components/tab.png deleted file mode 100644 index 776fac22..00000000 Binary files a/src/apps/AppHelpDeclaration/components/tab.png and /dev/null differ diff --git a/src/apps/AppHelpDeclaration/details.vue b/src/apps/AppHelpDeclaration/details.vue index 95cd5fbb..d7cc839a 100644 --- a/src/apps/AppHelpDeclaration/details.vue +++ b/src/apps/AppHelpDeclaration/details.vue @@ -1,37 +1,112 @@ @@ -42,6 +117,7 @@ export default { list: [], data: {}, id: '', + doItShow: false, } }, onLoad(o) { @@ -53,15 +129,21 @@ export default { }, methods: { getDetail() { - this.$instance.post(`/app/apphelpdeclarationinfo/queryDetailById?id=${this.id}`).then(res => { + this.$http.post(`/app/apphelpdeclarationinfo/queryDetailById?id=${this.id}`).then(res => { if(res.code == 0) { this.data = res.data this.list = res.data.reason.split(',') } }) }, - preview(index) { - this.$previewImage(this.data.files, index, "url"); + preview(images, img) { + uni.previewImage({ + urls: images.map(v => v.url), + current: img + }) + }, + toContent(status) { + uni.navigateTo({ url: `./result?status=${status}` }) }, } } @@ -69,6 +151,37 @@ export default { \ No newline at end of file diff --git a/src/apps/AppHelpDeclaration/list.vue b/src/apps/AppHelpDeclaration/list.vue index 90b1d754..d77fbb3e 100644 --- a/src/apps/AppHelpDeclaration/list.vue +++ b/src/apps/AppHelpDeclaration/list.vue @@ -1,5 +1,5 @@ @@ -58,11 +61,15 @@ export default { current: 1, areaId: '', areaName: '', - status: '', + declareReason: '', } }, onShow() { - this.$dict.load('helpDeclarationStatus') + this.$dict.load('helpDeclarationStatus').then(() => { + uni.$on('update', () => { + this.getList() + }) + }) this.getList() }, methods: { @@ -74,10 +81,12 @@ export default { }, getList() { - this.$http.post('/app/apphelpdeclarationinfo/list',null,{ + this.$http.post('/app/apphelpdeclarationinfo/listByEw',null,{ params: { current: this.current, - // status: this.tabIndex == 0 ? + areaId: this.areaId, + searchType: this.tabIndex, + declareReason: this.declareReason // 风险类型 } }).then((res) => { if(res?.data) { @@ -90,6 +99,10 @@ export default { uni.navigateTo({url: './add'}) }, + toDetail(id) { + uni.navigateTo({url: `./details?id=${id}`}) + }, + onReachBottom() { this.current ++ this.getList() @@ -99,8 +112,7 @@ export default { \ No newline at end of file diff --git a/src/apps/AppHelpDeclaration/result.vue b/src/apps/AppHelpDeclaration/result.vue index 38d92965..17210189 100644 --- a/src/apps/AppHelpDeclaration/result.vue +++ b/src/apps/AppHelpDeclaration/result.vue @@ -1,82 +1,232 @@ - diff --git a/src/components/AiBottomBtn.vue b/src/components/AiBottomBtn.vue new file mode 100644 index 00000000..ae1c8b0a --- /dev/null +++ b/src/components/AiBottomBtn.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/src/components/AiGroup.vue b/src/components/AiGroup.vue new file mode 100644 index 00000000..1f8b4767 --- /dev/null +++ b/src/components/AiGroup.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/src/components/AiItem.vue b/src/components/AiItem.vue new file mode 100644 index 00000000..cf5be5a1 --- /dev/null +++ b/src/components/AiItem.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/components/AiPagePicker.vue b/src/components/AiPagePicker.vue index 0027e434..f35a0f19 100644 --- a/src/components/AiPagePicker.vue +++ b/src/components/AiPagePicker.vue @@ -28,6 +28,7 @@ export default { return { configList: { resident: {url: "/components/pages/selectResident", label: "name"}, + sysUser:{url: "/components/pages/selectSysUser", label: "name"}, gird: {url: "/components/pages/selectGird", label: "girdName"}, party: {url: "/components/pages/selectParty", label: "name"}, custom: {...this.ops} diff --git a/src/components/AiTabPanes.vue b/src/components/AiTabPanes.vue index a45a967a..afc67206 100644 --- a/src/components/AiTabPanes.vue +++ b/src/components/AiTabPanes.vue @@ -1,5 +1,5 @@