Merge branch 'dev_lqs' into 'master'

修改

See merge request !79

H5/src/views/modefyAvatar.vue

@@ -61,8 +61,9 @@ export default {
     onRead(file) {
       this.avatar = file.content;
       console.log("file", file);
+      const inviteCode = JSON.parse(localStorage.getItem('user').inviteCode);
       const params = {
-        inviteCode: "bbbbbb"
+        inviteCode: inviteCode
       };
       const fd = new FormData();
       fd.append("files", file.file);

H5/src/views/settings.vue

@@ -77,7 +77,7 @@ export default {
         if (res.userId) {
           localStorage.setItem("user", JSON.stringify(res));
           this.$nextTick(() => {
-            this.inviteeCode = res.inviteCode;
+            this.inviteeCode = res.beInvitedCode;
             this.avatar = res.headImage;
           });
         }