zhaoxiaohai 3 years ago
parent
commit
cd85cdb538
1 changed files with 19 additions and 7 deletions
  1. 19 7
      pages/login/modules/login.js

+ 19 - 7
pages/login/modules/login.js

@@ -1,4 +1,6 @@
 const _Http = getApp().globalData.http;
+let count = 0; //接口完成数量
+
 function loginMsg(res) {
     wx.setStorageSync('account_list', res.account_list);
     if (res.account_list.length == 1) {
@@ -30,12 +32,8 @@ function query_userauth(i = 0) {
         console.log("权限", res)
         if (res.msg != '成功') return query_userauth(i + 1);
         wx.setStorageSync('userauth', res.data);
-        let pages = getCurrentPages();
-        let prevPage = pages[pages.length - 2];
-        if (prevPage && prevPage.__route__ == 'pages/tabbar/home/index') prevPage.refreshData(item);
-        wx.switchTab({
-            url: '/pages/tabbar/home/index'
-        })
+        count += 1;
+        toHome();
     });
     if (!getApp().globalData.socketEstablish) getApp().initSocket();
     console.log(getApp().globalData.SocketTask)
@@ -50,6 +48,8 @@ function querySite_Parameter(i = 0) {
     }).then(res => {
         if (res.msg != '成功') return query_userauth(i + 1);
         wx.setStorageSync('siteP', res.data);
+        count += 1;
+        toHome();
     })
 }
 /* 查询轮播图 */
@@ -60,8 +60,20 @@ function query_adspacelist(i = 0) {
         "method": "query_adspacelist",
         "content": {}
     }).then(res => {
-        if (res.msg != '成功') return query_adspacelist(i + 1);
         console.log("轮播图", res)
+        if (res.msg != '成功') return query_adspacelist(i + 1);
+        count += 1;
+        toHome();
+    })
+}
+
+function toHome() {
+    if (count < 3) return;
+    let pages = getCurrentPages();
+    let prevPage = pages[pages.length - 2];
+    if (prevPage && prevPage.__route__ == 'pages/tabbar/home/index') prevPage.refreshData(item);
+    wx.switchTab({
+        url: '/pages/tabbar/home/index'
     })
 }
 /* 站点数据查询 */