Merge branch 'dev_lqs' into 'master'

修改

See merge request !87

H5/src/components/BaseNavBar.vue

@@ -27,7 +27,6 @@ export default {
         "Publish",
         "FastestProgress",
         "MonthAward",
-        "Instructions",
         "Settings",
         "Grade",
         "AirDrop",

H5/src/views/invite.vue

@@ -2,10 +2,11 @@
   <div class="invite-code">
     <div class="nav">
       <van-icon
-              name="arrow-left"
-              size="20"
-              class="nav-left"
-              @click="$router.go(-1)"
+        name="arrow-left"
+        size="20"
+        class="nav-left"
+        color="#ffffff"
+        @click="$router.go(-1)"
       />
       <img :src="imgSrc" alt="" class="imgCode" />
     </div>
@@ -54,7 +55,7 @@ export default {
 .invite-code {
   width: 100%;
   height: 100vh;
-  background: url("../assets/images/invite1.png");
+  background: url("../assets/images/invite_1.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
   .imgCode {

H5/src/views/modefyAvatar.vue

@@ -60,8 +60,10 @@ export default {
       });
     },
     onRead(file) {
-      this.avatar = file.content;
-      console.log("file", file);
+      if (!localStorage.getItem('user').inviteCode) {
+        this.$toast.fail('当前用户没有邀请码');
+        return
+      }
       const inviteCode = JSON.parse(localStorage.getItem('user').inviteCode);
       const params = {
         inviteCode: inviteCode
@@ -70,8 +72,12 @@ export default {
       fd.append("files", file.file);
       uploadImage(params, fd).then(res => {
         console.log(res);
+        this.avatar = file.content;
         this.imageUrl = res.zxUrl;
         this.canSubmit = true;
+      }).catch(err => {
+        console.log('上传图像', err);
+        this.$toast.fail('图片上传失败,请重新选择');
       });
     },
     onDeleteAvatar(file, detail) {