diff --git a/src/view/user/CutPortrait.vue b/src/view/user/CutPortrait.vue
index b3da69c1735e08a1f5415ae0a6007b0da7480c14..7ce46109d45b5bd16c5b709a8b8f8a204a5c5b7f 100644
--- a/src/view/user/CutPortrait.vue
+++ b/src/view/user/CutPortrait.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="center">
-    <el-button class="outLogin" @click="isShowDialog = true"
-      >{{$t('user.editAvatar')}}</el-button
-    >
+    <el-button class="outLogin" @click="isShowDialog = true">{{
+      $t("user.editAvatar")
+    }}</el-button>
     <el-dialog
       :title="$t('user.editAvatar')"
       :visible.sync="isShowDialog"
@@ -17,31 +17,31 @@
         @change="uploadImg($event)"
       />
       <el-row>
-          <div v-if="isShowFileButton" class="center" style="height: 400px">
-            <el-popover
-              trigger="hover"
-              :content="$t('user.selectAvatarTip', [imageMaxSize])"
-            >
-              <div class="choose-file-btn" @click="changeFile" slot="reference">
-                {{$t('user.selectAvatar')}}
-              </div>
-            </el-popover>
-          </div>
-          <div v-else class="center">
-            <vueCropper
-              style="width: 550px; height: 400px;"
-              ref="cropper"
-              :img="options.img"
-              :auto-crop="options.autoCrop"
-              :fixed-box="options.fixedBox"
-              :can-move-box="options.canMoveBox"
-              :auto-crop-width="options.autoCropWidth"
-              :auto-crop-height="options.autoCropHeight"
-              :center-box="options.centerBox"
-              @realTime="realTime"
-            >
-            </vueCropper>
-          </div>
+        <div v-if="isShowFileButton" class="center" style="height: 400px">
+          <el-popover
+            trigger="hover"
+            :content="$t('user.selectAvatarTip', [imageMaxSize])"
+          >
+            <div class="choose-file-btn" @click="changeFile" slot="reference">
+              {{ $t("user.selectAvatar") }}
+            </div>
+          </el-popover>
+        </div>
+        <div v-else class="center">
+          <vueCropper
+            style="width: 550px; height: 400px"
+            ref="cropper"
+            :img="options.img"
+            :auto-crop="options.autoCrop"
+            :fixed-box="options.fixedBox"
+            :can-move-box="options.canMoveBox"
+            :auto-crop-width="options.autoCropWidth"
+            :auto-crop-height="options.autoCropHeight"
+            :center-box="options.centerBox"
+            @realTime="realTime"
+          >
+          </vueCropper>
+        </div>
         <!-- <el-col :span="8" style="height: 400px;">
           <h2 style="text-align: center; line-height: 50px">头像预览</h2>
           <div class="show-preview">
@@ -55,15 +55,23 @@
         </el-col> -->
       </el-row>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="isShowDialog = false">{{$t('common.cancel')}}</el-button>
+        <el-button @click="isShowDialog = false">{{
+          $t("common.cancel")
+        }}</el-button>
 
-        <router-link :to="{ name: 'Home' }" style="margin-left: 1em;">
+        <router-link
+          :to="{
+            path: `/member/${this.username}/setting`,
+          }"
+          @click.native="refresh"
+          style="margin-left: 1em"
+        >
           <el-button
             type="primary"
             @click="commitCut"
             v-loading.fullscreen.lock="fullscreenLoading"
             :disabled="Object.keys(previews).length === 0"
-            >{{$t('common.submit')}}</el-button
+            >{{ $t("common.submit") }}</el-button
           >
         </router-link>
       </span>
@@ -90,6 +98,10 @@ export default {
       type: Object,
       require: true,
     },
+    //
+    username: {
+      type: String,
+    },
   },
   data() {
     return {
@@ -111,6 +123,9 @@ export default {
     };
   },
   methods: {
+    refresh() {
+      this.$router.go(0);
+    },
     // 关闭截图对话框弹窗
     closeDialog() {
       this.isShowDialog = false;
@@ -131,7 +146,7 @@ export default {
       }
       // 判断文件是否超出大小限制
       if (file.size / 1024 / 1024 > this.imageMaxSize) {
-        this.$message.error($t('user.selectAvatarTip', [imageMaxSize]));
+        this.$message.error($t("user.selectAvatarTip", [imageMaxSize]));
         return false;
       }
       //fileReader 接口，用于异步读取文件数据
@@ -166,10 +181,10 @@ export default {
             Authorization: "Bearer " + getToken(),
           },
         }).then((res) => {
-          this.$message.success(this.$t('user.editAvatarSuccess'));
+          this.$message.success(this.$t("user.editAvatarSuccess"));
           res = res.data;
-          if (res.code === "000000") {
-            this.imageUrl = res.data.path;
+          if (res.code == 200) {
+            this.imageUrl = res.data;
             this.closeDialog();
             this.fullscreenLoading = false;
             this.SetUrl();
diff --git a/src/view/user/Profile.vue b/src/view/user/Profile.vue
index 99db85f93f8529c8beada3b08c92c59f65916b53..8fe7f2ef12d670bb187ccc653dbd32a200c247d2 100644
--- a/src/view/user/Profile.vue
+++ b/src/view/user/Profile.vue
@@ -7,21 +7,22 @@
             <el-avatar
               :size="64"
               :src="profile.avatar"
+              :preview-src-list="[profile.avatar]"
             />
             <p class="mt-3">{{ profile.alias || profile.username }}</p>
           </div>
           <div>
             <p class="content">
-              {{ $t('user.score') }}：<code>{{ profile.score }}</code>
+              {{ $t("user.score") }}：<code>{{ profile.score }}</code>
             </p>
 
             <p class="content">
-              {{ $t('user.join') }}：{{
-                dayjs(profile.createTime).format('YYYY/MM/DD HH:MM:ss')
+              {{ $t("user.join") }}：{{
+                dayjs(profile.createTime).format("YYYY/MM/DD HH:MM:ss")
               }}
             </p>
 
-            <p class="content">{{ $t('user.bio') }}：{{ profile.bio }}</p>
+            <p class="content">{{ $t("user.bio") }}：{{ profile.bio }}</p>
 
             <div>
               <button
@@ -29,7 +30,7 @@
                 class="button is-success button-center is-fullwidth"
                 @click="handleUnFollow(user.id)"
               >
-                {{ $t('Author.unFollow') }}
+                {{ $t("Author.unFollow") }}
               </button>
 
               <button
@@ -37,7 +38,7 @@
                 class="button is-link button-center is-fullwidth"
                 @click="handleFollow(user.id)"
               >
-                {{ $t('Author.follow') }}
+                {{ $t("Author.follow") }}
               </button>
             </div>
           </div>
@@ -47,24 +48,28 @@
       <div class="column">
         <el-card class="box-card" shadow="never">
           <!-- 导航栏 -->
-          <el-menu default-active="1" mode="horizontal" style="margin-top: -15px;">
+          <el-menu
+            default-active="1"
+            mode="horizontal"
+            style="margin-top: -15px"
+          >
             <el-menu-item index="1" @click="toTopic()">
               <i class="el-icon-menu"></i>
-              <span slot="title">{{ $t('user.topics') }}</span>
+              <span slot="title">{{ $t("user.topics") }}</span>
             </el-menu-item>
             <el-menu-item index="2" @click="toFollow()">
               <i class="el-icon-star-on"></i>
-              <span slot="title">{{ $t('user.follow') }}</span>
+              <span slot="title">{{ $t("user.follow") }}</span>
             </el-menu-item>
             <el-menu-item index="3" @click="toFans()">
               <i class="el-icon-user-solid"></i>
-              <span slot="title">{{ $t('user.fans') }}</span>
+              <span slot="title">{{ $t("user.fans") }}</span>
             </el-menu-item>
           </el-menu>
           <!--用户发布的话题-->
-          <div style="padding: 20px 0;" v-if="active === 1">
+          <div style="padding: 20px 0" v-if="active === 1">
             <div v-if="topics.length === 0">
-              {{ $t('user.blankTopic') }}
+              {{ $t("user.blankTopic") }}
             </div>
             <div v-else class="profile-info">
               <article
@@ -90,30 +95,27 @@
                   <nav class="level has-text-grey is-size-7">
                     <div class="level-left">
                       <span class="mr-1">
-                        {{ $t('post.release') }}:{{
-                          dayjs(item.createTime).format('YYYY/MM/DD HH:mm:ss')
+                        {{ $t("post.release") }}:{{
+                          dayjs(item.createTime).format("YYYY/MM/DD HH:mm:ss")
                         }}
                       </span>
                     </div>
                   </nav>
                 </div>
                 <div v-if="token" class="media-right">
-                  <div
-                    v-if="profile.username === user.username"
-                    class="level"
-                  >
+                  <div v-if="profile.username === user.username" class="level">
                     <div class="level-item mr-1">
                       <router-link
                         :to="{ name: 'post-edit', params: { id: item.id } }"
                       >
                         <span class="tag is-warning">{{
-                          $t('post.edit')
+                          $t("post.edit")
                         }}</span>
                       </router-link>
                     </div>
                     <div class="level-item">
                       <a @click="handleDelete(item.id)">
-                        <span class="tag is-danger">{{ $t('post.del') }}</span>
+                        <span class="tag is-danger">{{ $t("post.del") }}</span>
                       </a>
                     </div>
                   </div>
@@ -134,25 +136,22 @@
           <!-- 粉丝 -->
           <Fan v-if="active === 3" :topicUser="profile" />
         </el-card>
-
-        
-        
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import { getInfoByName } from '@/api/user'
-import pagination from '@/component/Pagination'
-import { mapGetters } from 'vuex'
-import { deletePost } from '@/api/post'
-import { follow, hasFollow, unFollow } from '@/api/follow'
+import { getInfoByName } from "@/api/user";
+import pagination from "@/component/Pagination";
+import { mapGetters } from "vuex";
+import { deletePost } from "@/api/post";
+import { follow, hasFollow, unFollow } from "@/api/follow";
 
-import Follow from '@/component/Nav/Follow'
-import Fan from '@/component/Nav/Fan'
+import Follow from "@/component/Nav/Follow";
+import Fan from "@/component/Nav/Fan";
 export default {
-  name: 'Profile',
+  name: "Profile",
   components: { pagination, Follow, Fan },
   data() {
     return {
@@ -165,13 +164,13 @@ export default {
         size: 5,
         total: 0,
       },
-    }
+    };
   },
   computed: {
-    ...mapGetters(['token', 'user']),
+    ...mapGetters(["token", "user"]),
   },
   created() {
-    this.fetchUserById()
+    this.fetchUserById();
   },
   methods: {
     fetchUserById() {
@@ -180,65 +179,62 @@ export default {
         this.page.current,
         this.page.size
       ).then((res) => {
-        const { data } = res
-        this.profile = data.user
-        this.page.current = data.topics.current
-        this.page.size = data.topics.size
-        this.page.total = data.topics.total
-        this.topics = data.topics.records
-        if(this.token != null && this.token !== '')
-        {
-          hasFollow(this.profile.id).then(value => {
-              const { data } = value
-              this.hasFollow = data.hasFollow
-          })
+        const { data } = res;
+        this.profile = data.user;
+        this.page.current = data.topics.current;
+        this.page.size = data.topics.size;
+        this.page.total = data.topics.total;
+        this.topics = data.topics.records;
+        if (this.token != null && this.token !== "") {
+          hasFollow(this.profile.id).then((value) => {
+            const { data } = value;
+            this.hasFollow = data.hasFollow;
+          });
         }
-      })
+      });
     },
     handleDelete(id) {
       deletePost(id).then((value) => {
-        const { code, message } = value
+        const { code, message } = value;
         if (code === 200) {
-          this.$message.success(message)
+          this.$message.success(message);
           setTimeout(() => {
-            this.$router.push({ path: '/' })
-          }, 500)
+            this.$router.push({ path: "/" });
+          }, 500);
         }
-      })
+      });
     },
     toTopic() {
-      this.active = 1
+      this.active = 1;
     },
     toFollow() {
-      this.active = 2
+      this.active = 2;
     },
     toFans() {
-      this.active = 3
+      this.active = 3;
     },
-    handleFollow: function(id) {
-      if(this.token != null && this.token !== '')
-      {
-        follow(this.profile.id).then(response => {
-          const { message } = response
-          this.$message.success(message)
-          this.hasFollow = !this.hasFollow
-          this.profile.followerCount = parseInt(this.profile.followerCount) + 1
-        })
-      }
-      else{
-        this.$message.success(this.$t('Author.login'))
+    handleFollow: function (id) {
+      if (this.token != null && this.token !== "") {
+        follow(this.profile.id).then((response) => {
+          const { message } = response;
+          this.$message.success(message);
+          this.hasFollow = !this.hasFollow;
+          this.profile.followerCount = parseInt(this.profile.followerCount) + 1;
+        });
+      } else {
+        this.$message.success(this.$t("Author.login"));
       }
     },
-    handleUnFollow: function(id) {
-      unFollow(this.profile.id).then(response => {
-        const { message } = response
-        this.$message.success(message)
-        this.hasFollow = !this.hasFollow
-        this.profile.followerCount = parseInt(this.profile.followerCount) - 1
-      })
+    handleUnFollow: function (id) {
+      unFollow(this.profile.id).then((response) => {
+        const { message } = response;
+        this.$message.success(message);
+        this.hasFollow = !this.hasFollow;
+        this.profile.followerCount = parseInt(this.profile.followerCount) - 1;
+      });
     },
   },
-}
+};
 </script>
 
 <style scoped></style>
diff --git a/src/view/user/Setting.vue b/src/view/user/Setting.vue
index dbab8073802812a3db5a17c61c3d84825d2dcc44..f2119a64269943cfd2a7e5e38b6924501f78ad2f 100644
--- a/src/view/user/Setting.vue
+++ b/src/view/user/Setting.vue
@@ -10,7 +10,7 @@
             <el-tab-pane :label="$t('user.info')" name="first">
               <el-form
                 :label-position="labelPosition"
-                label-width="150px"
+                label-width="100px"
                 :model="user"
                 ref="user"
               >
@@ -49,7 +49,7 @@
             <el-tab-pane :label="$t('user.password')" name="second">
               <el-form
                 :label-position="labelPosition"
-                label-width="150px"
+                label-width="180px"
                 status-icon
                 :model="password"
                 :rules="rules"
@@ -59,14 +59,21 @@
                   :label="$t('user.oldPassword')"
                   prop="oldPassword"
                 >
-                  <el-input v-model="password.oldPassword" />
+                  <el-input v-model="password.oldPassword" type="password" />
                 </el-form-item>
                 <el-form-item
                   :label="$t('user.newPassword')"
                   prop="newPassword"
                 >
-                  <el-input v-model="password.newPassword" />
+                  <el-input v-model="password.newPassword" type="password" />
+                </el-form-item>
+                <el-form-item
+                  :label="$t('Register.password2')"
+                  prop="checkPassword"
+                >
+                  <el-input v-model="password.checkPassword" type="password" />
                 </el-form-item>
+
                 <el-form-item>
                   <el-button type="primary" @click="update_password">{{
                     $t("user.submit")
@@ -86,6 +93,7 @@
               <CutPortrait
                 :upload-url="UploadUrl"
                 @getUrl="getUrl"
+                v-bind:username="this.user.username"
               ></CutPortrait>
             </el-tab-pane>
             <el-tab-pane :label="$t('user.email')" name="fourth">
@@ -165,6 +173,16 @@ export default {
     CutPortrait,
   },
   data() {
+    const validatePass = (rule, value, callback) => {
+      if (value == "") {
+        callback(new Error(this.$t("Register.rePass")));
+      } else if (value != this.password.newPassword) {
+        callback(new Error(this.$t("Register.matchPass")));
+      } else {
+        callback();
+      }
+    };
+
     var validateUserPassword = (rule, value, callback) => {
       //检查密码是否正确
       checkUserPassword(this.user.username, this.password.oldPassword).then(
@@ -192,6 +210,7 @@ export default {
       password: {
         oldPassword: "",
         newPassword: "",
+        checkPassword: "",
       },
       ruleEmail: {
         email: "",
@@ -224,6 +243,17 @@ export default {
             trigger: "blur",
           },
         ],
+        checkPassword: [
+          {
+            required: true,
+            message: this.$t("Register.checkPassword"),
+            trigger: "blur",
+          },
+          {
+            validator: validatePass,
+            trigger: "blur",
+          },
+        ],
       },
       ruleEmail: {
         email: "",
@@ -284,8 +314,8 @@ export default {
       this.$refs.ruleEmail.validate((valid) => {
         if (valid) {
           updateEmail(this.user.username, this.ruleEmail.email).then((resp) => {
-            let {code, message} = resp;
-            if(code === 200) {
+            let { code, message } = resp;
+            if (code === 200) {
               this.$message.success(this.$t("user.success"));
               this.fetchInfo();
             } else {
@@ -297,6 +327,7 @@ export default {
     },
     getUrl(path) {
       this.imgPath = path;
+      this.user.avatar = path;
     } /* ,
     resetForm(formName) {
       this.$refs[formName].resetFields()