Merge branch 'dev_lqs' into 'master'

修改

See merge request !89

H5/src/views/invite.vue

@@ -6,7 +6,7 @@
         size="20"
         class="nav-left"
         color="#ffffff"
-        @click="$router.go(-1)"
+        @click="handlerBack"
       />
       <img :src="imgSrc" alt="" class="imgCode" />
     </div>
@@ -25,6 +25,14 @@ export default {
     this.inviteCode();
   },
   methods: {
+    handlerBack() {
+      try {
+        this.$bridgeToAppFun.navigateBack();
+      } catch {
+        console.log("不能和App交互");
+        this.$router.go(-1);
+      }
+    },
     inviteCode() {
       const _this = this;
       let loading = _this.$toast.loading({

H5/src/views/settings.vue

@@ -84,11 +84,14 @@ export default {
       });
     },
     logout() {
-      logout().then().catch(err => {
-        console.log('后台退出err', err);
+      logout().then(res => {
+        if (res.code == 0) {
+          localStorage.clear()
+        }
+      }).catch(err => {
+        console.log(err);
       });
       this.$bridgeToAppFun.logoutToApp();
-      localStorage.removeItem("token");
     },
     jumpToInstructions() {
       this.$router.push("/instructions");