Merge remote-tracking branch 'origin/demo_' into demo_

src/views/account/settings/page/modules/AvatarModal.vue

@@ -82,12 +82,13 @@ export default {
         fileName: ''
       },
       previews: {
-        url: this.$store.getters.avatar
+        url: this.BaseTool.Constant.FILE_URL + this.$store.getters.avatar
       }
     }
   },
   methods: {
     edit (id) {
+      this.options.img = this.previews.url
       this.visible = true
       this.id = id
       /* 获取原始头像 */