From 71674c1caf9983cf0bca5885645966d3930598e4 Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Tue, 17 Aug 2021 16:55:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BD=91=E4=B8=8A=E5=AE=B6=E5=9B=AD?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/onlineHome/finacial.js | 26 +++ src/api/onlineHome/my.js | 30 +++ src/api/onlineHome/threeAffairs.js | 53 +++++ src/api/onlineHome/villageAffairs.js | 19 ++ src/permission.js | 23 +- src/router/index.js | 37 ++++ src/views/onlineHome/advice.vue | 89 +++++++- src/views/onlineHome/expenditureDetail.vue | 239 ++++++++------------- src/views/onlineHome/gzdt.vue | 82 +++++++ src/views/onlineHome/hnzc.vue | 82 +++++++ src/views/onlineHome/home.vue | 43 +++- src/views/onlineHome/homePoll.vue | 67 +----- src/views/onlineHome/inAndOutDetail.vue | 215 +++++++----------- src/views/onlineHome/incomeDetail.vue | 214 +++++++----------- src/views/onlineHome/mailList.vue | 50 ++--- src/views/onlineHome/my.vue | 3 +- src/views/onlineHome/password.vue | 59 ++++- src/views/onlineHome/threeAffairs.vue | 101 +++++---- src/views/onlineHome/workbench.vue | 1 - src/views/onlineHome/zcfg.vue | 83 +++++++ src/views/onlineHome/zdjs.vue | 81 +++++++ src/views/onlineHomeIndex.vue | 2 +- src/views/onlineHomeLogin.vue | 14 +- 23 files changed, 1009 insertions(+), 604 deletions(-) create mode 100644 src/api/onlineHome/finacial.js create mode 100644 src/api/onlineHome/my.js create mode 100644 src/api/onlineHome/threeAffairs.js create mode 100644 src/api/onlineHome/villageAffairs.js create mode 100644 src/views/onlineHome/gzdt.vue create mode 100644 src/views/onlineHome/hnzc.vue create mode 100644 src/views/onlineHome/zcfg.vue create mode 100644 src/views/onlineHome/zdjs.vue diff --git a/src/api/onlineHome/finacial.js b/src/api/onlineHome/finacial.js new file mode 100644 index 00000000..cdf961ee --- /dev/null +++ b/src/api/onlineHome/finacial.js @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 查收入数据 +export function getFinancialIn(data) { + return request({ + url: '/finance/open/getFinancialIn', + method: 'get', + params: data + }) +} +// 查支出数据 +export function getFinancialOut(data) { + return request({ + url: '/finance/open/getFinancialOut', + method: 'get', + params: data + }) +} +// 查收支数据 +export function getFinancialInAndOut(data) { + return request({ + url: '/finance/open/getFinancialInAndOut', + method: 'get', + params: data + }) +} diff --git a/src/api/onlineHome/my.js b/src/api/onlineHome/my.js new file mode 100644 index 00000000..b52a9021 --- /dev/null +++ b/src/api/onlineHome/my.js @@ -0,0 +1,30 @@ +import request from '@/utils/request' + +//新增投诉建议 +export function adviceAdd(query) { + return request({ + url: '/service/advice/add', + method: 'post', + data: query + }) +} +// 用户密码重置 +export function updateUserPwd(oldPassword, newPassword) { + const data = { + oldPassword, + newPassword + } + return request({ + url: '/system/user/profile/updatePwd', + method: 'post', + params: data + }) +} +// 上传投诉建议照片 +export function uploadFileBase(data) { + return request({ + url: '/common/upload', + method: 'post', + data: data + }) +} diff --git a/src/api/onlineHome/threeAffairs.js b/src/api/onlineHome/threeAffairs.js new file mode 100644 index 00000000..11803c8e --- /dev/null +++ b/src/api/onlineHome/threeAffairs.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询三务公开列表 +export function listAffairs(query) { + return request({ + url: '/service/affairs/list', + method: 'get', + params: query + }) +} + +// 查询三务公开详细 +export function getAffairs(id) { + return request({ + url: '/service/affairs/get/' + id, + method: 'get' + }) +} + +// 新增三务公开 +export function addAffairs(data) { + return request({ + url: '/service/affairs/add', + method: 'post', + data: data + }) +} + +// 修改三务公开 +export function updateAffairs(data) { + return request({ + url: '/service/affairs/edit', + method: 'post', + data: data + }) +} + +// 删除三务公开 +export function delAffairs(id) { + return request({ + url: '/service/affairs/remove/' + id, + method: 'get' + }) +} + +// 导出三务公开 +export function exportAffairs(query) { + return request({ + url: '/service/affairs/export', + method: 'get', + params: query + }) +} diff --git a/src/api/onlineHome/villageAffairs.js b/src/api/onlineHome/villageAffairs.js new file mode 100644 index 00000000..f52e05c8 --- /dev/null +++ b/src/api/onlineHome/villageAffairs.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +// 查询三务公开列表 +export function listVillageAffairs(query) { + return request({ + url: '/service/villageAffairs/list', + method: 'get', + params: query + }) +} + +// 查询三务公开详细 +export function getVillageAffairs(id) { + return request({ + url: '/service/villageAffairs/get/' + id, + method: 'get' + }) +} + diff --git a/src/permission.js b/src/permission.js index f59ecbe0..280cd393 100644 --- a/src/permission.js +++ b/src/permission.js @@ -38,22 +38,7 @@ const whiteList = [ '/circulationList', '/circulationAdd', '/onlineHomeLogin', - '/onlineHomeIndex', - '/onlineHome/publicity', - '/onlineHome/workbench', - '/onlineHome/home', - '/onlineHome/my', - '/onlineHome/threeAffairs', - '/onlineHome/homePoll', - '/onlineHome/incomeDetail', - '/onlineHome/inAndOutDetail', - '/onlineHome/expenditureDetail', - '/onlineHome/mailList', - '/onlineHome/password', - '/onlineHome/livePay', - '/onlineHome/advice', - '/onlineHome/done', - '/onlineHome/personalPicture', + ] router.beforeEach((to, from, next) => { @@ -78,11 +63,14 @@ router.beforeEach((to, from, next) => { next() }).catch(err => { store.dispatch('LogOut').then(() => { + console.log(to.path) // Message.error(err) if ('/authenticRight/index'.indexOf(to.path) !== -1) { next({ path: '/authenticRight/login' }) } else if ('/homestead/index'.indexOf(to.path) !== -1) { next({ path: '/homestead/login' }) + } else if (to.path.indexOf('/onlineHome') !== -1) { + next(`/onlineHomeLogin`) } else { next({ path: '/' }) } @@ -93,6 +81,7 @@ router.beforeEach((to, from, next) => { } } } else { + console.log(to.path) // 没有token if (whiteList.indexOf(to.path) !== -1) { // 在免登录白名单，直接进入 @@ -102,6 +91,8 @@ router.beforeEach((to, from, next) => { next(`/authenticRight/login?redirect=${to.fullPath}`) } else if ('/homestead/index'.indexOf(to.path) !== -1) { next(`/homestead/login?redirect=${to.fullPath}`) + } else if (to.path.indexOf('/onlineHome') !== -1) { + next(`/onlineHomeLogin`) } else { next(`/login?redirect=${to.fullPath}`) } diff --git a/src/router/index.js b/src/router/index.js index 4e3bfac5..57af9531 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -599,6 +599,43 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/circulation/circulationAdd'], resolve) } + , + { + path: '/onlineHome/zcfg', + name: 'zcfg', + meta: { + title: '政策法规', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/zcfg'], resolve) + }, + { + path: '/onlineHome/hnzc', + name: 'hnzc', + meta: { + title: '惠农政策', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/hnzc'], resolve) + }, + { + path: '/onlineHome/gzdt', + name: 'gzdt', + meta: { + title: '工作动态', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/gzdt'], resolve) + }, + { + path: '/onlineHome/zdjs', + name: 'zdjs', + meta: { + title: '制度建设', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/zdjs'], resolve) + } ]; diff --git a/src/views/onlineHome/advice.vue b/src/views/onlineHome/advice.vue index 99fd5dfc..f3078412 100644 --- a/src/views/onlineHome/advice.vue +++ b/src/views/onlineHome/advice.vue @@ -13,7 +13,7 @@

类型：

- + 投诉 建议 @@ -26,7 +26,7 @@ - + + + - 提交 + 提交 @@ -59,6 +63,11 @@ diff --git a/src/views/onlineHome/expenditureDetail.vue b/src/views/onlineHome/expenditureDetail.vue index c7dca62d..d22352bd 100644 --- a/src/views/onlineHome/expenditureDetail.vue +++ b/src/views/onlineHome/expenditureDetail.vue @@ -6,210 +6,161 @@ @click-left="$router.back(-1)" /> - -

北行庄村账套

+ +

{{$store.state.user.bookName}}

 - -  日期选择 + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/views/onlineHome/gzdt.vue b/src/views/onlineHome/gzdt.vue new file mode 100644 index 00000000..2d7274b0 --- /dev/null +++ b/src/views/onlineHome/gzdt.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/views/onlineHome/hnzc.vue b/src/views/onlineHome/hnzc.vue new file mode 100644 index 00000000..cc415d15 --- /dev/null +++ b/src/views/onlineHome/hnzc.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/views/onlineHome/home.vue b/src/views/onlineHome/home.vue index fbcf297d..cbb2e66b 100644 --- a/src/views/onlineHome/home.vue +++ b/src/views/onlineHome/home.vue @@ -72,17 +72,29 @@ /> - - - + + + + + + + @@ -93,7 +105,12 @@ components: { onlineHomeIndex }, - name: "home" + name: "home", + data() { + return { + activeName: [], + }; + }, } @@ -105,4 +122,8 @@ text-align: center; background-color: #39a9ed; } +>>> #rules .van-collapse-item__content{ +padding-top: 0; + padding-bottom: 0; +} diff --git a/src/views/onlineHome/homePoll.vue b/src/views/onlineHome/homePoll.vue index 9621c5f2..9e1cd13e 100644 --- a/src/views/onlineHome/homePoll.vue +++ b/src/views/onlineHome/homePoll.vue @@ -54,7 +54,7 @@

3人已参与

 - + - - - - - - - - 57票 87% - - - - - - - - - - - - - - 57票 87% - - - - - - - - - - - - - - 57票 87% - - - - - - - + diff --git a/src/views/onlineHome/inAndOutDetail.vue b/src/views/onlineHome/inAndOutDetail.vue index c3362702..125cacef 100644 --- a/src/views/onlineHome/inAndOutDetail.vue +++ b/src/views/onlineHome/inAndOutDetail.vue @@ -6,205 +6,96 @@ @click-left="$router.back(-1)" /> - -

北行庄村账套

+ +

{{$store.state.user.bookName}}

 - -  日期选择 + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -224,4 +157,6 @@ >>>.van-cell::after { border-bottom: none; } + input::-ms-input-placeholder{text-align: center;} + input::-webkit-input-placeholder{text-align: center;} diff --git a/src/views/onlineHome/incomeDetail.vue b/src/views/onlineHome/incomeDetail.vue index 727c1370..7011ca78 100644 --- a/src/views/onlineHome/incomeDetail.vue +++ b/src/views/onlineHome/incomeDetail.vue @@ -6,199 +6,90 @@ @click-left="$router.back(-1)" /> - -

北行庄村账套

+ +

{{$store.state.user.bookName}}

 - -  日期选择 + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -224,4 +158,6 @@ >>>.van-cell::after { border-bottom: none; } + input::-ms-input-placeholder{text-align: center;} + input::-webkit-input-placeholder{text-align: center;} diff --git a/src/views/onlineHome/mailList.vue b/src/views/onlineHome/mailList.vue index 1d8281ee..a41745b0 100644 --- a/src/views/onlineHome/mailList.vue +++ b/src/views/onlineHome/mailList.vue @@ -23,11 +23,13 @@

{{item.phone}}

 - - + + + + @@ -39,6 +41,8 @@ diff --git a/src/views/onlineHome/my.vue b/src/views/onlineHome/my.vue index 09e11067..ec393857 100644 --- a/src/views/onlineHome/my.vue +++ b/src/views/onlineHome/my.vue @@ -19,7 +19,7 @@ - +