diff --git a/api/api.js b/api/api.js index 3e056e1..234cb05 100644 --- a/api/api.js +++ b/api/api.js @@ -1,5 +1,7 @@ -const url_ = "http://lhc.pi.sa0.online:81"; +const url_ = "http://ld.win.sa0.online:81"; let url_array = {}; +url_array['微信登录'] = `${url_}/api/mp/login`; +url_array['用户信息'] = `${url_}/api/mp/get_info`; url_array['YO'] = `${url_}/api/yo`; const api = (mark) => { if (mark === '') return url_; diff --git a/api/index.js b/api/index.js index 5c74e83..83b7412 100644 --- a/api/index.js +++ b/api/index.js @@ -1,8 +1,46 @@ import $post from "../lu/post.js" import $res from "../lu/response.js" import $api from "./api.js" - -export function yo(then) { +import { + delToken +} from '../tool/member.js' +export function userLoginAction(code, then) { + $post({ + url: $api('微信登录'), + data: { + code + }, + then: (response) => { + $res({ + response, + then: (response) => { + then(response.data.token) + }, + error: (res) => { + uni.$lu.toast(res.message); + } + }) + } + }) +} +export function getUserInfoAction(then, msg = true) { + $post({ + url: $api('用户信息'), + then: (response) => { + $res({ + response, + then: (response) => { + then(response.data) + }, + error: (res) => { + delToken() + if (msg) uni.$lu.toast(res.message); + } + }) + } + }) +} +export function yo(then) { $post({ url: $api('YO'), then: (response) => { diff --git a/components/Login/Login.vue b/components/Login/Login.vue index 9dcf6e2..691327e 100644 --- a/components/Login/Login.vue +++ b/components/Login/Login.vue @@ -7,21 +7,44 @@ import { ref } from 'vue' + import { + getUserInfoAction + } from '@/api/index.js' const mask_show = ref(true) const login_show = ref(true) + + import { + onShow + } from '@dcloudio/uni-app' + + onShow(() => { + getUserInfo() + }) + const toLogin = () => { uni.navigateTo({ url: '/pages/main/login/login' }) } + const getUserInfo = () => { + login_show.value = true + mask_show.value = true + getUserInfoAction((info) => { + login_show.value = false + mask_show.value = false + }, false) + } + + defineExpose({ + getUserInfo + }) diff --git a/pages/main/user/user.vue b/pages/main/user/user.vue index 2d43acb..1abacbd 100644 --- a/pages/main/user/user.vue +++ b/pages/main/user/user.vue @@ -8,17 +8,35 @@ ref } from 'vue' import config from '@/config.js' + import { + delToken + } from '@/tool/member.js' + const login_ref = ref(null) + const loginRef = (e) => { + login_ref.value = e + } + const quitClick = () => { + delToken() + login_ref.value.getUserInfo() + } -