diff --git a/package-lock.json b/package-lock.json index 7386f23..6109d71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1986,7 +1986,7 @@ }, "dependencies": { "@vue/vue-loader-v15": { - "version": "npm:vue-loader@15.11.1", + "version": "15.11.1", "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz", "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==", "dev": true, @@ -8500,6 +8500,11 @@ "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", "dev": true }, + "shvl": { + "version": "2.0.3", + "resolved": "https://registry.npmmirror.com/shvl/-/shvl-2.0.3.tgz", + "integrity": "sha512-V7C6S9Hlol6SzOJPnQ7qzOVEWUQImt3BNmmzh40wObhla3XOYMe4gGiYzLrJd5TFa+cI2f9LKIRJTTKZSTbWgw==" + }, "side-channel": { "version": "1.0.6", "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.6.tgz", @@ -10048,6 +10053,22 @@ "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz", "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==" }, + "vuex-persistedstate": { + "version": "4.1.0", + "resolved": "https://registry.npmmirror.com/vuex-persistedstate/-/vuex-persistedstate-4.1.0.tgz", + "integrity": "sha512-3SkEj4NqwM69ikJdFVw6gObeB0NHyspRYMYkR/EbhR0hbvAKyR5gksVhtAfY1UYuWUOCCA0QNGwv9pOwdj+XUQ==", + "requires": { + "deepmerge": "^4.2.2", + "shvl": "^2.0.3" + }, + "dependencies": { + "deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==" + } + } + }, "watchpack": { "version": "2.4.2", "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.2.tgz", diff --git a/package.json b/package.json index 86a53f3..a50f1a7 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,8 @@ "vue": "^2.7.8", "vue-demi": "^0.14.0", "vue-router": "^3.5.4", - "vuex": "^3.6.2" + "vuex": "^3.6.2", + "vuex-persistedstate": "^4.1.0" }, "devDependencies": { "@babel/core": "^7.18.10", diff --git a/src/api/home.js b/src/api/home.js index 75e6903..56fb462 100644 --- a/src/api/home.js +++ b/src/api/home.js @@ -9,6 +9,14 @@ export function communityActivity(data) { data }) } + //活动志愿者（新） + export function activitylist(data) { + return request({ + url: `/voluntary/activityInfo/list`, + method: 'post', + data + }) + } //获取新闻列表 export function newsTrends(data) { return request({ diff --git a/src/api/integral.js b/src/api/integral.js new file mode 100644 index 0000000..5146d8c --- /dev/null +++ b/src/api/integral.js @@ -0,0 +1,11 @@ +// axios +import request from '@/utils/request' + +// 获取积分记录 +export function selectChangeByUserId(data) { + return request({ + url: '/voluntary/points/selectChangeByUserId', + method: 'post', + data + }) +} \ No newline at end of file diff --git a/src/api/reservationService.js b/src/api/reservationService.js new file mode 100644 index 0000000..6621f2c --- /dev/null +++ b/src/api/reservationService.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' +export function userdemandAdd(data) { + return request({ + url: `/governance/userdemand/add`, + method: 'post', + data + }) + } \ No newline at end of file diff --git a/src/api/user.js b/src/api/user.js index d74cba5..361536d 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -1,5 +1,31 @@ // axios import request from '@/utils/request' +//志愿者信息 +export function volunteerInfo(data) { + return request({ + url: '/voluntary/volunteerInfo/page', + method: 'post', + data + }) +} +//意见反馈类型字典 +export function dictlist(data) { + return request({ + url: `/sys/dict/data/dictlist`, + method: 'post', + message: '获取中...', + data + }) +} +//意见反馈上报 +export function resiFeedbacksave(data) { + return request({ + url: `/sys/resiFeedback/save`, + method: 'post', + message: '上报中...', + data + }) +} // 登录 export function login(data) { diff --git a/src/router/router.config.js b/src/router/router.config.js index 1b1c40d..acefc34 100644 --- a/src/router/router.config.js +++ b/src/router/router.config.js @@ -74,6 +74,12 @@ export const constantRouterMap = [ component: () => import('@/views/appeal'), meta: { title: '我上报的问题', keepAlive: false } }, + { + path: '/appeal', + name: 'appeal', + component: () => import('@/views/appeal'), + meta: { title: '我提交的人民建议', keepAlive: false } + }, { path: '/appealDetail', name: 'appealDetail', diff --git a/src/store/index.js b/src/store/index.js index 1ee10b9..73fad50 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -3,6 +3,7 @@ import Vuex from 'vuex' import getters from './getters' import app from './modules/app' + Vue.use(Vuex) const store = new Vuex.Store({ diff --git a/src/store/modules/app.js b/src/store/modules/app.js index 4fc9487..3153c5d 100644 --- a/src/store/modules/app.js +++ b/src/store/modules/app.js @@ -1,7 +1,8 @@ -import {checkWxmpRegister, getUserWechatByUserId} from '@/api/user' - +import {checkWxmpRegister, getUserWechatByUserId,volunteerInfo} from '@/api/user' +import vuexPersistedstate from 'vuex-persistedstate'; const state = { userInfo: {}, + volunteerInfo:{}, appId: '', realNameFlag:null, agencyId:null, @@ -14,6 +15,10 @@ const mutations = { state.agencyId = userInfo.agencyId; state.realNameFlag = userInfo.realName; }, + SET_VOLUNTTER_INFO(state,volunteerInfo){ + console.log(volunteerInfo,'志愿者用户信息'); + state.volunteerInfo = volunteerInfo; + }, SET_APP_ID(state, appId){ state.appId = appId }, @@ -21,11 +26,16 @@ const mutations = { // console.log(houseId,'houseIdVueX'); state.houseId = houseId; }, + + } + const actions = { // 设置是否注册 getUserInfo({ commit}) { return new Promise((resolve, reject) => { + console.log("sdf;ll;sdf"); + if (Object.keys(state.userInfo).length) { resolve(state.userInfo) } @@ -38,10 +48,19 @@ const actions = { reject(error) }) }) + }, + setvolunteerInfo({commit},setvolunteerInfo){ + commit('SET_VOLUNTTER_INFO',setvolunteerInfo) } + } export default { state, mutations, - actions + actions, + plugins: [ + vuexPersistedstate({ + storage: window.localStorage, // 使用 localStorage 保持 Vuex 状态 + }) + ] } diff --git a/src/views/home/index.vue b/src/views/home/index.vue index dd04b4c..7751ac7 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -226,6 +226,7 @@ import registerDialog from '@/components/registerDialog'; import {guidecategoryTags,guidecategorylist,newsTrends,communityActivity, icEventOldDiscuss, advertisingTag, communityPublicity,handelClicsupport,communityPublicityGiveLike } from '@/api/home'; import { querystaffmessage } from '@/api/message'; import { inspRecord } from '@/api/satisfaction'; +import { volunteerInfo } from '@/api/activity'; var timer = null export default { data() { @@ -285,10 +286,12 @@ export default { }; }, created() { - + console.log(this.$store.state.app,"sdflkgjskdlfgjskl"); this.agencyId = this.$store.state.app.agencyId; this.userId = this.$store.state.app.userInfo.id; this.customerId = this.$store.state.app.userInfo.customerId; + this.userInfo() + console.log(this.$store.state.app,"sdflkgjskdlfgjskl"); this.guidecategoryTag() this.communityActivity()//获取轮播图与活动列表 this.icEventOldDiscuss()//获取居民议事列表 @@ -304,21 +307,41 @@ export default { this.guidecategorylists() var that = this; - timer = setInterval(function () { - that.changefunction(); - }, 7000) + // timer = setInterval(function () { + // that.changefunction(); + // }, 7000) + }, methods: { + //获取志愿者信息 + userInfo() { + let parm = { + "loginFlag": 1, + "pageNo": 1, + "pageSize": 100 + } + volunteerInfo(parm).then(res => { + console.log(res, "lskdfjlkdsf"); + this.$store.dispatch('setvolunteerInfo',res.data.list[0]) + }) + + + }, //轮播切换 changefunction() { - // console.log(this.noticeList); + if (this.noticeList.length) { + // console.log(this.noticeList); let length = this.noticeList.length; if (this.noticeIndex <= length) { this.noticeIndex=this.noticeIndex + 1 } else { this.noticeIndex=0 } - this.noticeText=this.noticeList[this.noticeIndex]//每触发一次均会将testflase变量为ture和false之间转换 + this.noticeText=this.noticeList[this.noticeIndex]//每触发一次均会将testflase变量为ture和false之间转换 + }else{ + return + } + }, //轮播 newsTrends() { diff --git a/src/views/mine/Feedback/index.vue b/src/views/mine/Feedback/index.vue index acd05cf..f27b296 100644 --- a/src/views/mine/Feedback/index.vue +++ b/src/views/mine/Feedback/index.vue @@ -1,9 +1,9 @@ + + + + + diff --git a/src/views/peoSuggestion/solicitationDaily.vue b/src/views/peoSuggestion/solicitationDaily.vue index d4f5a61..2c86636 100644 --- a/src/views/peoSuggestion/solicitationDaily.vue +++ b/src/views/peoSuggestion/solicitationDaily.vue @@ -11,7 +11,7 @@
-