|
|
@@ -179,9 +179,13 @@ export default {
|
|
|
pulling() {
|
|
|
this.triggered = true;
|
|
|
},
|
|
|
- refresher() {
|
|
|
- this.init();
|
|
|
- this.triggered = false;
|
|
|
+ refresher(){
|
|
|
+ let that = this
|
|
|
+ this.init()
|
|
|
+ this.$api.refreshUserInfo();
|
|
|
+ setTimeout(function(){
|
|
|
+ that.triggered = false
|
|
|
+ },500)
|
|
|
},
|
|
|
restore() {
|
|
|
this.triggered = false;
|
|
|
@@ -220,8 +224,12 @@ export default {
|
|
|
this.$store.state.allowLoading = false;
|
|
|
const firstFunc = await this.getInfoAttached();
|
|
|
const seciedFunc = await this.getLevel();
|
|
|
+<<<<<<< HEAD
|
|
|
// this.$api.refreshUserInfo();
|
|
|
this.$store.state.allowLoading = true;
|
|
|
+=======
|
|
|
+ this.$store.state.allowLoading = true
|
|
|
+>>>>>>> ae3c0e80d7af9b78c30f703a3d0538b4dd4c18f2
|
|
|
},
|
|
|
jumpPopup() {
|
|
|
uni.showModal({
|