Merge branch 'master' of http://119.23.72.7/shiyu/icsalesProgram

pages/person/auth/index.js

@@ -106,7 +106,6 @@ Page({
    */
    */
   bindGetUserInfo(e) {
   bindGetUserInfo(e) {
     let self = this;
     let self = this;
-
     if (e.detail.errMsg == 'getUserInfo:ok') {
     if (e.detail.errMsg == 'getUserInfo:ok') {
       wx.login({
       wx.login({
         success(res) {
         success(res) {
@@ -157,11 +156,32 @@ Page({
         }
         }
       })
       })
     } else {
     } else {
-
       //用户拒绝获取资料
       //用户拒绝获取资料
+      wx.getNetworkType({
+        success(res) {
+          const networkType = res.networkType;
+          if (networkType != 'none') {
+            //有网络
+            wx.navigateTo({
+              url: '/pages/person/login/index'
+            });
+          } else {
+            wx.hideNavigationBarLoading();
+            wx.showToast({
+              title: '网络出现异常',
+              icon: 'none',
+              duration: 2000
+            });
+
+          }
+        },
+        fail: function () {
           wx.navigateTo({
           wx.navigateTo({
             url: '/pages/person/login/index'
             url: '/pages/person/login/index'
           });
           });
+        }
+      })
+
 
 
     }
     }
   },
   },