diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index c0041c47..faa6cb1c 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -314,3 +314,33 @@ export function financialAmountPublicMonthList(query) {
params: query // ?bookId=<账套ID 必填>&yearMonth=<查询年月 必填 yyyy-MM>
})
}
+
+// 查询用户个人信息
+export function getUserProfile() {
+ return request({
+ url: '/system/user/profile/get',
+ method: 'get'
+ })
+}
+
+// 修改用户个人信息
+export function updateUserProfile(data) {
+ return request({
+ url: '/system/user/profile/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 用户密码重置
+export function updateUserPwd(oldPassword, newPassword) {
+ const data = {
+ oldPassword,
+ newPassword
+ }
+ return request({
+ url: '/system/user/profile/updatePwd',
+ method: 'post',
+ params: data
+ })
+}
diff --git a/src/assets/images/sunVillage_info/btn_bg.png b/src/assets/images/sunVillage_info/btn_bg.png
new file mode 100644
index 00000000..c8c1b836
Binary files /dev/null and b/src/assets/images/sunVillage_info/btn_bg.png differ
diff --git a/src/router/index.js b/src/router/index.js
index c07532a0..bcd6bbc0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3124,6 +3124,24 @@ export const constantRoutes = [
hidden: true,
},
component: (resolve) => require(['@/views/sunVillage_info/list_register_detail'], resolve)
+ },
+ { ////阳光村务(新)-- 合同信息
+ path: '/sunVillage_info/user',
+ name: 'sunVillageInfoUser',
+ meta: {
+ title: '个人信息',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/sunVillage_info/user'], resolve)
+ },
+ { ////阳光村务(新)-- 合同信息
+ path: '/sunVillage_info/passWord',
+ name: 'sunVillageInfoPassWord',
+ meta: {
+ title: '修改密码',
+ hidden: true,
+ },
+ component: (resolve) => require(['@/views/sunVillage_info/passWord'], resolve)
}
];
diff --git a/src/views/sunVillage_info/index.vue b/src/views/sunVillage_info/index.vue
index 8c24f8aa..260c29b4 100644
--- a/src/views/sunVillage_info/index.vue
+++ b/src/views/sunVillage_info/index.vue
@@ -28,9 +28,20 @@
-
-
-
+
+
+
+
+
+
+
+
@@ -59,6 +70,12 @@
name: "certificateList",
data() {
return {
+ showPopover: false,
+ actions: [
+ { text: '个人信息', icon: 'manager-o' , index: 0 },
+ { text: '修改密码', icon: 'edit' , index: 1 },
+ { text: '退出登录', icon: 'revoke' , index: 2 },
+ ],
deptIdOptions:[],
villageVisbile:false,
showBookList:false,
@@ -159,6 +176,10 @@
logout().then(res => {
this.$router.push({path:"/sunVillage_info/login"})
})
+ },
+ selectChange(val){
+ console.log(val)
+ val.index == 0 ? this.$router.push({path:"/sunVillage_info/user"}) : val.index == 1 ? this.$router.push({path:"/sunVillage_info/passWord"}) : val.index == 2 ? this.logout() : '';
}
},
}
@@ -199,21 +220,26 @@
}
}
}
+ /deep/ .van-popover__wrapper{
+ position: absolute;
+ top: 64px;
+ right: 36px;
+ }
.exit_btn{
width: 61px;
height: 61px;
- background: #3f3d56;
+ /*background: #3f3d56;*/
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
- position: absolute;
- top: 64px;
- right: 36px;
+ /*position: absolute;*/
+ /*top: 64px;*/
+ /*right: 36px;*/
.icon{
- width: 35px;
- height: 33px;
- background: url('../../assets/images/sunVillage_info/index_icon_2.png') no-repeat;
+ width: 100%;
+ height: 100%;
+ background: url('../../assets/images/sunVillage_info/login_head_t.png') no-repeat;
background-size: 100% 100%;
}
}
diff --git a/src/views/sunVillage_info/list_finance.vue b/src/views/sunVillage_info/list_finance.vue
index ac577ef1..3aecddb5 100644
--- a/src/views/sunVillage_info/list_finance.vue
+++ b/src/views/sunVillage_info/list_finance.vue
@@ -103,21 +103,20 @@
methods: {
getList(){
var _this = this;
- setTimeout(() => {
- console.log(_this.queryParams)
- financePublicList(_this.queryParams).then(response => {
- _this.listLength = response.total;
- _this.applicationList = response.rows;
+ financePublicList(_this.queryParams).then(response => {
+ _this.listLength = response.total;
+ response.rows.map(res=>{
+ _this.applicationList.push(res);
+ })
+ if(_this.applicationList.length >= response.total){
+ _this.finished = true;
+ return;
+ }else{
+ _this.loading = false;
+ _this.queryParams.pageNum += 1 ;
+ }
- if(_this.applicationList.length >= response.total){
- _this.finished = true;
- return;
- }else{
- _this.loading = false;
- _this.queryParams.pageNum += 1 ;
- }
- });
- }, 1000);
+ });
},
tabClick(year){
this.queryParams.year = year ;
diff --git a/src/views/sunVillage_info/list_finance_add.vue b/src/views/sunVillage_info/list_finance_add.vue
index 14f5aeba..00078493 100644
--- a/src/views/sunVillage_info/list_finance_add.vue
+++ b/src/views/sunVillage_info/list_finance_add.vue
@@ -80,7 +80,7 @@
-
+
保存
@@ -188,6 +188,11 @@
diff --git a/src/views/sunVillage_info/user.vue b/src/views/sunVillage_info/user.vue
new file mode 100644
index 00000000..896ca056
--- /dev/null
+++ b/src/views/sunVillage_info/user.vue
@@ -0,0 +1,204 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 男
+ 女
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+