Merge branch 'master' of ssh://gogs.zfire.top:2222/zfire-front/recycle-mobile

* 'master' of ssh://gogs.zfire.top:2222/zfire-front/recycle-mobile:
  no message

src/App.vue

@@ -3,7 +3,7 @@
   import {
     getUserInfo
   } from "@/common/utils/util"
-
+  import api from '@/common/http/'
   var getUserValTimeId = null
   export default {
     onLaunch: function() {
@@ -36,8 +36,12 @@
         this.updateUserInfo();
       });
 
+      uni.$on('getSendMsg', () => {
+        this.getSendMsg();
+      });
+
       if (this.$store.state.user.token) {
-        this.updateUserInfo();
+        this.getSendMsg();
       }
 
       uni.getSystemInfo({
@@ -68,16 +72,24 @@
 
     },
     methods: {
-      async updateUserInfo() {
+      async getSendMsg() {
         (function getUserVal() {
           if (getUserValTimeId) {
             clearTimeout(getUserValTimeId)
           }
-          getUserInfo().then(res => {
-            getUserValTimeId = setTimeout(getUserVal, 2000)
-          })
+          api.get('/user/talk/unread').then((res) => {
+              uni.setTabBarBadge({
+                index: 2,
+                text: res.data
+              })
+              getUserValTimeId = setTimeout(getUserVal, 2000)
+            })
+            .catch((error) => {});
         })()
       },
+      async updateUserInfo() {
+
+      },
     },
   }
 </script>
@@ -87,4 +99,4 @@
   @import "uview-ui/index.scss";
 
   @import "styles/iconfont.css";
-</style>
+</style>

src/common/utils/util.js

@@ -11,11 +11,6 @@ export const getUserInfo = () => {
         const {
           data
         } = response;
-        // tab数字角标
-        uni.setTabBarBadge({
-          index: 2,
-          text: data.unread ? data.unread + "" : 0
-        })
         uni.setStorageSync('recycle_mobile_user', data);
         resolve(data);
       })

src/mixins/index.js

@@ -20,6 +20,7 @@ export const goLoginPage = (new firstPerform(1000)).refactor(function() {
   navToPage({
     url: "/pages/login/indexs"
   }, "redirectTo")
+  store.dispatch('user/resetToken')
 });
 // #ifdef MP-WEIXIN
 export const routerBeforeEach = (new firstPerform(200)).refactor(function() {

src/pages/login/indexs.vue

@@ -112,7 +112,7 @@
               this.$store.commit("user/set_name", res.data.name)
               this.$store.commit("user/set_avatar", res.data.avatar)
               this.$store.commit("user/set_userId", res.data.baseUserId)
-              uni.$emit("updateUserInfo")
+              uni.$emit("getSendMsg")
               this.$navToPage({
                 url: "/pages/index/index"
               }, "switchTab")

src/pages/message/index.vue

@@ -50,23 +50,25 @@
   import api from '@/common/http/'
   export default {
     onShow() {
-      uni.$emit("updateUserInfo")
-      // #ifdef H5
-      var getList = () => {
-        if (this.timeId) {
-          clearTimeout(this.timeId)
+      if (this.$store.state.user.token) {
+        uni.$emit("getSendMsg")
+        // #ifdef H5
+        var getList = () => {
+          if (this.timeId) {
+            clearTimeout(this.timeId)
+          }
+          api.postJson('/user/talk/list2', {
+            userId: this.$store.state.user.userId,
+            pageNum: 1,
+            pageSize: -1
+          }, false).then(res => {
+            this.list = res.data.records
+            this.timeId = setTimeout(getList, 2000)
+          })
         }
-        api.postJson('/user/talk/list2', {
-          userId: this.$store.state.user.userId,
-          pageNum: 1,
-          pageSize: -1
-        }, false).then(res => {
-          this.list = res.data.records
-          this.timeId = setTimeout(getList, 2000)
-        })
+        getList()
+        // #endif
       }
-      getList()
-      // #endif
     },
     // #ifdef H5
     data() {

src/store/modules/user/actions.js

@@ -39,4 +39,4 @@ export default {
     })
   },
 
-}
+}