解决冲突

H5/src/views/grade.vue

@@ -114,7 +114,7 @@ export default {
       this.$router.push({ name: urlName });
     },
     getstatus() {
-      const userId = JSON.parse(localStorage.getItem("user")).userId;
+      const userId = 13933770003;
       const _this = this;
       getForestStatus(userId)
         .then(res => {