Browse Source

no message

sys 2 years ago
parent
commit
116940d855
3 changed files with 18 additions and 10 deletions
  1. 2 1
      api/login.js
  2. 8 0
      manifest.json
  3. 8 9
      pages/login/localPhoneLogin.vue

+ 2 - 1
api/login.js

@@ -2,6 +2,7 @@ import {request} from '@/service/ajax'
 
 const newsUrl = '/utility/'
 // 登陆
-export const login = (data) => request(newsUrl + 'one_click_login', 'post', { ...data },false)
+// export const login = (data) => request(newsUrl + 'one_click_login', 'post', { ...data },false)
+export const login = (data) => request('/auth/oauth2/token', 'get', { ...data },false)
 export const forgetPassword = (data) => request(newsUrl + 'forget_password', 'post', { ...data },false)
 export const register = (data) => request(newsUrl + 'register', 'post', { ...data },true)

+ 8 - 0
manifest.json

@@ -136,6 +136,14 @@
                     "pathRewrite" : {
                         "^/utility" : "utility"
                     }
+                },
+                "/auth" : {
+                    "target" : "http://www.icoco.tech:9999/admin",
+                    "changeOrigin" : true,
+                    "secure" : false,
+                    "pathRewrite" : {
+                        "^/auth" : "auth"
+                    }
                 }
             }
         }

+ 8 - 9
pages/login/localPhoneLogin.vue

@@ -147,23 +147,22 @@ export default {
       //#endif
     },
     oneClickLogin(mobile){
-      login({'mobile':mobile}).then((res)=>{
-        console.log(res)
+      login({'mobile':mobile,'grant_type':'mobile','scope':'server'}).then((res)=>{
         if(res.code===0){
+          if(res.data.isNewUser){
+            uni.navigateTo({
+              'url':'/pages/perfect/sexAndAge'
+            })
+          }else {
             tools.setLoginData(res.data)
             setTimeout(()=>{
-              // uni.switchTab({
-              //   'url':'/pages/index/index'
-              // })
               uni.navigateTo({
                 'url':'/pages/perfect/sexAndAge'
               })
             },1500)
+          }
         }else{
-
-            uni.navigateTo({
-              'url':'/pages/perfect/sexAndAge'
-            })
+          tools.error(res.msg)
         }
       }).catch((e)=>{
         console.log(e)