From 060df3fcac2313523b8884c66a0e45d0b9f47ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Thu, 25 Aug 2022 11:31:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/sunVillage_info/fixedAssets.js | 30 +++ src/assets/images/sunVillage_info/btn_bg.png | Bin 0 -> 4080 bytes src/router/index.js | 18 ++ src/views/sunVillage_info/index.vue | 46 +++- src/views/sunVillage_info/list_finance.vue | 27 ++- .../sunVillage_info/list_finance_add.vue | 7 +- .../sunVillage_info/list_finance_edit.vue | 7 +- src/views/sunVillage_info/list_issues.vue | 28 +-- src/views/sunVillage_info/list_issues_add.vue | 7 +- .../sunVillage_info/list_issues_edit.vue | 7 +- src/views/sunVillage_info/list_register.vue | 28 +-- .../sunVillage_info/list_register_add.vue | 7 +- .../sunVillage_info/list_register_edit.vue | 7 +- src/views/sunVillage_info/list_tourists.vue | 28 +-- .../sunVillage_info/list_tourists_add.vue | 7 +- .../sunVillage_info/list_tourists_edit.vue | 7 +- src/views/sunVillage_info/passWord.vue | 183 ++++++++++++++++ src/views/sunVillage_info/user.vue | 204 ++++++++++++++++++ 18 files changed, 574 insertions(+), 74 deletions(-) create mode 100644 src/assets/images/sunVillage_info/btn_bg.png create mode 100644 src/views/sunVillage_info/passWord.vue create mode 100644 src/views/sunVillage_info/user.vue 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 0000000000000000000000000000000000000000..c8c1b836f6e58429c6f32edf3b12413dc47eb822 GIT binary patch literal 4080 zcmaJ^c|25Y8=iQhMYaf`#-I?hn=MNiTb68LN--NI%rG+wWhtW=MGcJ*qSvdkPtvAD z3fU#Hm&hccC|mJO+xxx0-}nB$^T#>QdCq-Z_wwA=dCp02a5t&qg8HGWj0&RncepDAKkrE!#NHqcg#G`3$ zo@`GCdmNb&1SWpB0fz+zi_idok!e^kksLr}14&dr8r>K)eZLw6q*07P9)=E3hhPh; zKg}kBNp+2IbR$Oukg*hysR__13@0K8qOys=u%JLX3m0Y#`oW76jlWMrK)@d+>;PlX z&!9XVoPZV#CKYH1Mj4P{NDL5-1;bECC<3JqghOFi2owW>Aq=1}92A8!L<4^vAdxpF z#TVy-xBBHvbY~3mXS0KG5XiA($H2!BUffO9B>F6ZXmKSV1?7!#4rOoOY=7a zp2{LKX~Aq7gAV-8NF*^r*~TDIq(4U+Y#o0!h}RVY!(AYsH{2n-B`1OxVUq z?Lz%;82@U`atjZpLR_dUMktdkS`S~%-(XSg{=cK|hN5V2`` zNfZMV5rH;9K#>#!3=|DFAVMh!Di%W&o4Bv9SGkW4N9*ZWzRO2n{;-Ti8qJl9Je`m!Df;+iCpi}RSE6)RcQ?O!XD_#pojy08dK5XlyQQak z(RAm+(ysT5o4u1~h9y0%7FVx+P5-zh@{UwTiKb!&qw_teo?*3ZdRpiknSNZ~=WZNT zx9L2H4$#^3`u?fWD`J8xniqpMhIi*s1o1R|rClmMcdvg)*{L-xnDkvdPi@XGybGG! z<+;rTK5Rc8VS4tY=bkTx@lP@>)hl=I!`)Y@X##u(Yk#^`x;Wh9Sy}#-)W5Q+X$&$V z9hF>aO+c|2ZIZj|tfgvra_K~IqQmWo9ZHXMhV5GW|HL>kUxTu0o0d`y%)M_!(NC24 z-k_P>JbUf<3`t-n%vO-&%}4szcogV@Q!g)E7_phwoV%;Pn_%Kg*d}HsUZyEah~5_t zoES6`*oTZdK1qK%veuPjl0{W-isJXfkkFSi2qX6g4JRLtJ_WlKONoKb0_nQue(*FEduD&Vit??aI8|q;tol3G2YOt=TF>;^2DT+HaoESjwA7vh zw)m?0N@$3vn7MaHc)x3_s@xKCA-rXDuWn})nb_UD=GlB)m8P((c+1_6?!~8S4sHu3 zN!bWgS;*V~=S@HoQq9<-$m4)@+pQDs6}MxVeZDioyOl??Q|nCN1JO2U^JtC7RtEuj zfzb@pOE)wpJ}=blPz;S7eQR*wwigDMHXd10=d*TZw*Q#vykE5v@j%Wi9{2KcYnH{q z z;92Lq#B-Eea*cOcb27>-`b@)=+sq8QqOlAene$AWozzMrQII@2>B~dt9K=PJ0UOsh32k75caskw%pR%b)ibmZ!~tq zq&F6EFW$r#mu8gvj!Pa`7uhP!>$UDV6>d!SS2I>>tn0Sp>-5q#CS@14PrKdtX5QoI z*4xk{9b}BcV9l%5oj24{0FRPS7GYd_rmggI?1i^$o&%Z_HRP0f8|4im3jo$_FV0f^ zK46Y7r@uR4oUJmnzx)}F?JNLJz9IRxbIOwK6vf*6>Mh??+SEsS;Xd56R`0v=AbF!= z>7Dk$dP~36R90zdf8uH6j@Xg5bq0razt`>i5=0v=$Pe4DbmRs3*{6Exjq`ixQ29q~R$c~$_X5Omf@LM?qQ_&V{Xal@}y zE^(`-AFn$R>LkBZ)wOPGjQYujrOZ$CBj$aWGH0A+aP0+IdOP&Mxc2S=xIQ zxth;cpy2i2yaSTBSI6_TB;<_AUF}h7#%GSY)tmC#SMi>Jm<3nTb(;_F#LY0dGwDfo z=Bt`)RQ$*BT_DCIlmmphMEsr-i|+YQfQMivA_IN2g@o{t6t(rjhwAe^7YGX*#F8Ap6j$xdawC#va@=~ z10k;>kJ|r)=iP#s@Wv7HqLybbY0Z^4&vaS>Z1`VwV{mzglXC)HI@a?`x1RCXknTCR zR$>=`vxl^T|5RIHQlqUHZYXyG4j(Wz39*?2*HPo$uTHJcNzN9Rzx?f-U&0iBRau+; zLt7GwKee?b?whHRwNS*i=reZ^e?9(72Shl1J1@$hU%vVKSBM6YRtBlC-$>$-0< zdq0YM57o!t`X7nW$LFn2FGn{dwrite!*5;_;K}cJGtGVf)L7K1kWB5q+Fk=rtMk&f zhm)3bVmyhMKX-`b$*Pv8U7aPA#}Ds81zdZ&)^w>heG{*-aV2_RceN%&X; z1uOJ6`CGTT2TH?;(FH#D&$naunm$RBLpz_4loUR$YD6oOkD zr^M#a>Ced|t=O0~%{a%x&af$sXA|!y?(Cl>o+ znYQ2u-XQ_H;wZfvv(inQ^u3qVLSm&tQ~^~gglN~AAQ_Ps2V2Ly^}vyZdo?zRb5FDh zE{$RNuF6C}Jc6wq*&zSKPRZavh6}s)9FBWLClyt zUt8Z|;4Z?9uxFB^f5Pqjv&z_kiC6nwoO^m4%g&ZfIy*01vh$cKBrcrQ?aiCm-kc#L z@wVLSG5irz<$jXZQX>5L?Ks)ur}7%d)M8TU%WG5}wHaAo^W&G%{Ovd2?yVLl%+4fq j6hSrOi 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 @@ + + + + +