Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/apps/AppCreditPoints/components/sysUserIntegral.vue

@@ -46,14 +46,13 @@ export default {
   },
   created() {
     this.getInfo()
-    uni.$on("onShow", () => {
-      this.getInfo();
-    })
     uni.$on("reachBottom", () => {
       this.current++;
       this.getInfo()
     })
     uni.$on('updateIntegral', () => {
+      this.current = 1
+      this.list = []
       this.getInfo()
     })
   },

src/apps/AppCreditPoints/giveIntegral.vue

@@ -74,6 +74,9 @@ export default {
           this.flag = false
           this.$u.toast(res.msg)
         }
+      }).catch((err) => {
+        this.flag = false
+        this.$u.toast(err)
       })
     },
     handleSelectUser(v) {