Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

src/pages/index/index.vue

@@ -172,10 +172,7 @@
 			// 每次进入页面都刷新入驻状态
 			this.pageNumber = 0
 			
-			this.initSettleInfo();
-			if (this.status == 7) {
-				this.getLocation()
-			}
+			this.initSettleInfo();
 		},
 		methods: {
 			getData() {
@@ -211,7 +208,10 @@
 					self.search.pageNumber = 0
 					self.loadedOrder = false
 					self.loadOrderList();
-					await app.getBaseInfo(self, callBack);
+					await app.getBaseInfo(self, callBack);
+					if (this.status == 7) {
+						this.getLocation()
+					}
 					this.loaded = true;
 				} else {
 					this.loaded = true

src/pages/index/mine.vue

@@ -177,9 +177,6 @@
 				app.setUserData({}, this)
 				app.globalData.logout = true
 			},
-			handleSuperButton() {
-				this.$u.route({url: 'pages/mine/superLogin/index'})
-			},
 			async allowLogin() {
 				let res = await this.$u.api.allowLogin()
 				if (res && res.code == 200) {