登录优化

app.js

@@ -2,74 +2,6 @@ import { Jade } from "./jade/index"
 // const getUrl = require("./request").getUrl
 App({
   onLaunch(){
-    const logs=wx.getStorageSync('logs')||{}
-    const userCode= wx.getAccountInfoSync()||{}
-    const userInfo=wx.getStorageSync('userInfo')||{}
-    if(logs&&userCode&&false){
-      console.log(userInfo,"---------已登录",userCode);
-    }else{
-      wx.login({
-        success: res => {
-          console.log(res,"---------登录");
-          var code = res.code
-          wx.getUserInfo({
-            withCredentials: true,
-            success: res => {
-              console.log('getUserInfo')
-              wx.request({
-                url: Jade.getUrl("users/sign_in.json"),
-                method: 'POST',
-                data: {
-                  code: code,
-                  user_info: res.userInfo,
-                  encrypted_data: res.encryptedData,
-                  iv: res.iv
-                },
-                success: res => {
-                  const data = res.data;
-                  wx.setStorageSync('user', data)
-                  wx.setStorageSync('user_token', data.token)
-                  // Jade.UserManager.setUser(data)
-                  // Jade.UserManager.setToken(data.token)
-                  Jade.UserManager.authRequest({
-                    url: Jade.getUrl("babies.json"),
-                    success: (result) => {
-                      if (typeof result.data === "object") {
-                        wx.setStorageSync('baby', result.data)
-                      } else {
-                        wx.setStorageSync('baby', null)
-                      }
-                      // if (options && options.success) {
-                      //   options.success(result)
-                      // }
-                    },
-                    fail: err => {
-                      // if (options && options.success) {
-                      //   options.success(result)
-                      // }
-                    }
-                  })
-                }
-              })
-            },
-            fail: err => {
-              var pages = getCurrentPages()
-              var currentPage = pages[pages.length - 1]
-              if (currentPage.route == 'pages/study_package_activities/studyPackageActivityList' || currentPage.route == 'pages/webView/webView') {
-                console.log('authorizeDialog NavigateTo')
-                wx.navigateTo({
-                  url:`/pages/AuthorizeDialog/AuthorizeDialog?code=${code}&objc=UserManager`
-                })
-              } else {
-                console.log('authorizeDialog redirectTo')
-                wx.redirectTo({
-                  url:`/pages/AuthorizeDialog/AuthorizeDialog?code=${code}&objc=UserManager`
-                })
-              }
-            }
-          })
-        }
-      })
-    }
+  
   }
 })
\ No newline at end of file

pages/photo/photo.js

 // pages/photo/photo.js
+import { Jade } from "../../jade/index"
 Page({
 
   /**
@@ -8,9 +9,87 @@ Page({
 
   },
   goIndex(){
-    wx.navigateTo({
-      url: '/pages/takePhoto/takePhoto',
+    // wx.setStorageSync('user', data)
+    // wx.setStorageSync('user_token', data.token)
+    if(wx.getStorageSync('user')&&wx.getStorageSync('user_token')){
+      wx.redirectTo({
+        url: '/pages/takePhoto/takePhoto',
+      })
+      return
+    }
+    wx.showModal({
+      title: '登录弹窗',
+      content: '使用小程序前，请登录并授权小程序获取您的信息',
+      success (res) {
+        if (res.confirm) {
+          wx.login({
+            success: res => {
+              console.log(res,"---------登录");
+              var code = res.code
+              wx.getUserInfo({
+                withCredentials: true,
+                success: res => {
+                  console.log('getUserInfo')
+                  wx.request({
+                    url: Jade.getUrl("users/sign_in.json"),
+                    method: 'POST',
+                    data: {
+                      code: code,
+                      user_info: res.userInfo,
+                      encrypted_data: res.encryptedData,
+                      iv: res.iv
+                    },
+                    success: res => {
+                      const data = res.data;
+                      wx.setStorageSync('user', data)
+                      wx.setStorageSync('user_token', data.token)
+                      // Jade.UserManager.setUser(data)
+                      // Jade.UserManager.setToken(data.token)
+                      Jade.UserManager.authRequest({
+                        url: Jade.getUrl("babies.json"),
+                        success: (result) => {
+                          if (typeof result.data === "object") {
+                            wx.setStorageSync('baby', result.data)
+                          } else {
+                            wx.setStorageSync('baby', null)
+                          }
+                          wx.redirectTo({
+                            url: '/pages/takePhoto/takePhoto',
+                          })
+                          // if (options && options.success) {
+                          //   options.success(result)
+                          // }
+                        },
+                        fail: err => {
+                          // if (options && options.success) {
+                          //   options.success(result)
+                          // }
+                        }
+                      })
+                    }
+                  })
+                },
+                fail: err => {
+                  wx.redirectTo({
+                    url: '/pages/photo/photo',
+                  })
+                //  wx.onLoad()
+                }
+              })
+            }
+          })
+        } else if (res.cancel) {
+          wx.redirectTo({
+            url: '/pages/photo/photo',
+          })
+        }
+      }
     })
+   
+
+ 
+    
+   
   },
   /**
    * 生命周期函数--监听页面加载