diff --git a/config/index.js b/config/index.js index adc7b121..a73616ff 100644 --- a/config/index.js +++ b/config/index.js @@ -12,7 +12,7 @@ module.exports = { proxyTable: { "/api": { // 请求的目标主机 - // target: 'http://116.255.223.226:8082/nsgk_test/', // 公网测试环境 + //target: 'http://218.59.175.44:8082/nsgk_test/', // 公网测试环境 // target: `http://192.168.0.116:8091/nsgk_api/`, // 内网测试环境 target: 'http://localhost:8080/', //target: 'http://192.168.0.106:8080/', diff --git a/src/api/register/index.js b/src/api/register/index.js index 4e2f5f3d..df86ff15 100644 --- a/src/api/register/index.js +++ b/src/api/register/index.js @@ -70,3 +70,11 @@ export function depositList(query) { }) } +export function farmerLogin(data) { + return request({ + url: '/register/farmerLogin', + method: 'post', + data: data, + }) +} + diff --git a/src/assets/images/sunVillage_info/icon-s-filter.png b/src/assets/images/sunVillage_info/icon-s-filter.png new file mode 100644 index 00000000..2b794bac Binary files /dev/null and b/src/assets/images/sunVillage_info/icon-s-filter.png differ diff --git a/src/assets/maps/plotPremises_huancui.json b/src/assets/maps/plotPremises_huancui.json index e69de29b..fe51488c 100644 --- a/src/assets/maps/plotPremises_huancui.json +++ b/src/assets/maps/plotPremises_huancui.json @@ -0,0 +1 @@ +[] diff --git a/src/assets/maps/qu_huancui.json b/src/assets/maps/qu_huancui.json index e69de29b..fe51488c 100644 --- a/src/assets/maps/qu_huancui.json +++ b/src/assets/maps/qu_huancui.json @@ -0,0 +1 @@ +[] diff --git a/src/permission.js b/src/permission.js index e952f343..e545d5dd 100644 --- a/src/permission.js +++ b/src/permission.js @@ -187,6 +187,11 @@ const whiteList = [ '/plotPremisesMobile/index',//闲置资源 + '/sunVillage_info/login_farmer', //村民登录 + '/sunVillage_info/index_farmer', //村民主页 + '/sunVillage_info/financeOpen', //村民主页 + + //承包地确权 '/contracted/login',//登录 '/contracted/index',//首页 diff --git a/src/router/index.js b/src/router/index.js index 5fe47939..49de169a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -5927,6 +5927,33 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/contracted/user/passWord'], resolve) }, + { // 阳光村务(一村一码)-- 村民登录 + path: '/sunVillage_info/login_farmer', + name: 'sunVillageInfoFarmerLogin', + meta: { + title: '村民验证登录', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/login_farmer'], resolve) + }, + { // 阳光村务(一村一码)-- 村民主页 + path: '/sunVillage_info/index_farmer', + name: 'sunVillageInfoFarmerIndex', + meta: { + title: '阳光村务', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/index_farmer'], resolve) + }, + { ////阳光村务(一村一码)-- 财务公开榜 + path: '/sunVillage_info/financeOpen', + name: 'sunVillageInfoFinanceOpen', + meta: { + title: '财务公开榜', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/financeOpen'], resolve) + }, ]; diff --git a/src/views/sunVillage_info/financeOpen.vue b/src/views/sunVillage_info/financeOpen.vue new file mode 100644 index 00000000..021e90cf --- /dev/null +++ b/src/views/sunVillage_info/financeOpen.vue @@ -0,0 +1,289 @@ + + + + + diff --git a/src/views/sunVillage_info/identity_check.vue b/src/views/sunVillage_info/identity_check.vue index e9851d64..1263b44a 100644 --- a/src/views/sunVillage_info/identity_check.vue +++ b/src/views/sunVillage_info/identity_check.vue @@ -42,16 +42,20 @@ responseData: null, remainingSeconds: 3, // 剩余秒数,初始值为3秒 formData:null, + redirectPath: '/sunVillage_info/index_code_rights', + redirectName: null, + redirectQuery: null, }; }, created() { + this.loadRedirectInfo(); this.responseData = this.$route.query.responseData; // 判断是否已认证 if (this.responseData.isFacial === 'Y') { const countdownInterval = setInterval(() => { if (this.remainingSeconds === 0) { clearInterval(countdownInterval); // 清除计时器 - this.$router.push({ path: '/sunVillage_info/index_code_rights' }); + this.redirect(); } else { this.remainingSeconds--; } @@ -97,7 +101,7 @@ message: '人脸验证成功', duration: "1000" }); - this.$router.push({path: '/sunVillage_info/index_code_rights'}) + this.redirect(); } }) }, @@ -110,6 +114,25 @@ this.formData.append("file", file.file); this.$toast.clear(); }, + loadRedirectInfo() { + if(this.$route.query.redirectPath) + this.redirectPath = this.$route.query.redirectPath; + if(this.$route.query.redirectName) + this.redirectName = this.$route.query.redirectName; + if(this.$route.query.redirectQuery) + this.redirectQuery = this.$route.query.redirectQuery; + console.log('redirect info: ', this.redirectPath, this.redirectName, this.redirectQuery); + }, + redirect() { + let parms = {}; + if(this.redirectPath) + parms.path = this.redirectPath; + else if(this.redirectName) + parms.name = this.redirectName; + if(this.redirectQuery) + parms.query = this.redirectQuery; + this.$router.push(parms); + }, }, }; diff --git a/src/views/sunVillage_info/index_farmer.vue b/src/views/sunVillage_info/index_farmer.vue new file mode 100644 index 00000000..6046c7df --- /dev/null +++ b/src/views/sunVillage_info/index_farmer.vue @@ -0,0 +1,297 @@ + + + diff --git a/src/views/sunVillage_info/list_complaint.vue b/src/views/sunVillage_info/list_complaint.vue index 14aa5623..d474b703 100644 --- a/src/views/sunVillage_info/list_complaint.vue +++ b/src/views/sunVillage_info/list_complaint.vue @@ -6,7 +6,7 @@ > 投诉建议
-
+
+
+
+
+
+
+
+
+
+ + + + + +
+ + + + +