From 37a38615ccc0e820a01edc2dcc0ee880c78e6a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Wed, 20 Oct 2021 20:19:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AF=B9=E6=8E=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Yi.Framework.ApiMicroservice/YIDB.db      | Bin 69632 -> 69632 bytes
 .../Yi.Framework.Service/UserService.cs       |   1 +
 Yi.Vue/src/views/userInfo.vue                 |  32 +++++++++++++++---
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db
index 12c8f14b0eee85ad12854808f127414bb9b7b408..121fef4e353bb97df4b8e0da109bd55de4714ce5 100644
GIT binary patch
delta 323
zcmZozz|ydQWdmCRj~oO43;v`03;ApL<u(fn@bJgSvhp$rGssHnGBDb57_t}|8Rw>C
z>gMDpXFppx^Xb|NCZ;CFhQ_7_1`dUVddc~@LNE5ueA(XfY{vR$9TT6=YI(k{;mPjq
zr<0dG+c^Kl(*4ipG(PQ}{%l6i(;ZEo)0i%8uFY=|kmf(jz|Oy)f&Vwq_J{mm`QPy$
z<KNGJ76dm7DlF!oyuY7Mh=GAYgprjMNbxeVfGD=f_xqKk`HunhZUgE4!vB<iAOAM~
zH~e>j`hgIrcNYKTZSw`hfvUxUdijAgKTtCtkY;CO<=uRDzDj^J|0SRa#~Aqk@PFg~
vz<-AS75@{U?n@xJS<qk=zZ@$wBO?nBh-Bgh>J$Q-!vi*j4QR-d|1tsqc<E`s

delta 262
zcmZozz|ydQWdmCRPc#Gn3;v`03;ApLqc;l*c=9VLuyQj93(HC}FfcN37#bM^QEp16
zZccu3_Oq2UpRS!Cw7E9FML?Q?fq{#EKLh`7paBp0Z}WfUf5(4?|1AG8{{5Q;6&CYP
z-rvtB#LC6Y$jHjd$_b=cSXtPZIVa!mSAyu>2GaY5|0(}9{(b!0_|Ngb;lIm&45)V&
z|Kx4+1;p7|7(sfuz%&ahCmRbVkk7XH?tGO1hzZ9S`2X;K<Nv^ahW{1+6QIra_;2uE
h+AL_WieHWuWFrrVWa0*qtXyD{6HKyge)3;N006gWL>d49

diff --git a/Yi.Framework/Yi.Framework.Service/UserService.cs b/Yi.Framework/Yi.Framework.Service/UserService.cs
index 11226da2..57477e71 100644
--- a/Yi.Framework/Yi.Framework.Service/UserService.cs
+++ b/Yi.Framework/Yi.Framework.Service/UserService.cs
@@ -126,6 +126,7 @@ namespace Yi.Framework.Service
         {
             var user_data=await _Db.Set<user>().Include(u=>u.roles)
                 .Where(u => u.id == user_id && u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).FirstOrDefaultAsync();
+            user_data.password = null;
             user_data.roles.ToList().ForEach(u => u.users = null);
             return user_data;
         }
diff --git a/Yi.Vue/src/views/userInfo.vue b/Yi.Vue/src/views/userInfo.vue
index a63a4f83..63bc83a5 100644
--- a/Yi.Vue/src/views/userInfo.vue
+++ b/Yi.Vue/src/views/userInfo.vue
@@ -153,7 +153,7 @@
                                   <v-col 
                                   v-for="item in menuInfo"
                                   :key="item.id"
-                                  cols="6" sm="3" md="1">{{menuInfo.menu_name}}</v-col>
+                                  cols="6" sm="3" md="1">{{item.menu_name}}</v-col>
                                 </v-row>
                               </v-list-item-subtitle>
                             </v-list-item-content>
@@ -224,7 +224,7 @@
 
             <v-col cols="12" class="text-right">
               <v-btn color="primary" class="ma-4" min-width="100"> 清空 </v-btn>
-              <v-btn color="secondary" min-width="100"> 保存 </v-btn>
+              <v-btn color="secondary" @click="save()" min-width="100"> 保存 </v-btn>
             </v-col>
           </v-form>
         </material-card>
@@ -235,7 +235,8 @@
 
 <script>
 import userApi from "../api/userApi";
-import menuApi from "../api/menuApi"
+import menuApi from "../api/menuApi";
+import accountApi from "../api/accountApi"
 export default {
   name: "UserProfileView",
   data: () => ({
@@ -244,10 +245,10 @@ export default {
     editInfo: {},
     newPassword:"",
     dis_newPassword:true,
-    menuInfo:{}
+    menuInfo:[]
   }),
   created() {
-    // this.init();
+    this.init();
   },
  watch:{
     editInfo:{
@@ -266,9 +267,30 @@ export default {
  },
 
   methods: {
+    save()
+    {
+      accountApi.changePassword(this.editInfo,this.newPassword).then(resp=>{
+        if(resp.status)
+        {
+            this.$dialog.notify.error(resp.msg, {
+              position: "top-right",
+              timeout: 5000,
+            });
+        }
+        else
+        {
+ this.$dialog.notify.success(resp.msg, {
+              position: "top-right",
+              timeout: 5000,
+            });
+        }
+        this.init();
+      })
+    },
     init() {
       userApi.GetUserInfoById().then((resp) => {
         this.userInfo = resp.data;
+        this.userInfo.password="";
       this.editInfo= Object.assign({}, this.userInfo);
       });