dmg/xuexiaole-mobile
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:微信公众号登录

Browse Source
This commit is contained in:
MJ 2025-08-02 22:18:17 +08:00
parent 82bae4c441
commit b52c1f9bfd
9 changed files with 228 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
index.html
View File

@ -1,13 +1,22 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<meta charset="UTF-8" />
<script>
var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
CSS.supports('top: constant(a)'))
var coverSupport =
'CSS' in window &&
typeof CSS.supports === 'function' &&
(CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write(
'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
(coverSupport ? ', viewport-fit=cover' : '') + '" />')
(coverSupport ? ', viewport-fit=cover' : '') +
'" />',
)
</script>
<script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>
<script>
// 初始化
var vConsole = new VConsole()
</script>
<title></title>
<!--preload-links-->

41
src/api/login.ts
View File

@ -6,12 +6,12 @@ import { http } from './request/request'
export const getBindPhoneTypeApi = async data => {
return await http.post<any>('/xcx/login/getBindRelationList', data)
}
/**
* 手机号获取用户身份
* @param data 请求参数
*/
export const getAdminTypeByPhoneApi = async (params: any) =>
await http.get<any>('/sysUser/getAdminTypeByPhone', params)
// /**
// * 手机号获取用户身份
// * @param data 请求参数
// */
// export const getAdminTypeByPhoneApi = async (params: any) =>
// await http.get<any>('/sysUser/getAdminTypeByPhone', params)
/**
* 发送验证码
@ -30,12 +30,31 @@ export const smsLoginApi = async data =>
clientType: 'MOBILE',
})
/**
* 微信登录
* @param data 请求参数
*/
export const wxLoginApi = async data =>
await http.post<any>('/wxLogin', {
...data,
clientType: 'MOBILE',
})
/**
* 微信绑定账号
* @param data 请求参数
*/
export const wxBindAccountApi = async data =>
await http.post<any>('/wxBindAccount', {
...data,
clientType: 'MOBILE',
})
/**
* 获取用户信息
* @param data 请求参数
*/
export const getUserInfoApi = async () =>
await http.get<any>('/sysUser/selectUser')
export const getUserInfoApi = async () => await http.get<any>('/sysUser/selectUser')
/**
* 更新用户信息
@ -55,9 +74,7 @@ export const bindAuthInfoApi = async data =>
* 获取静默授权链接
* @param data 请求参数
*/
export const getAuthUrlApi = async () =>
await http.get<any>('/wechatPublic/getAuthUrl')
export const getAuthUrlApi = async () => await http.get<any>('/wechatPublic/getAuthUrl')
// 退出登录
export const logout = async () =>
await http.get<any>('/logout')
export const logout = async () => await http.get<any>('/logout')

11
src/api/request/interceptor.ts
View File

@ -33,15 +33,12 @@ export const responseInterceptor = async <T>(
console.log('response', response)
// 处理成功响应
if (statusCode === HTTP_STATUS.SUCCESS) {
if (data.statusCode === 200 || data.code === 200) return response
throw {
statusCode,
errMsg: data.data,
}
if (statusCode === HTTP_STATUS.SUCCESS && data.code === 200) {
return response
} else {
throw {
statusCode,
errMsg: data.message || '网络问题，请稍后再试',
}
}
}
@ -55,7 +52,7 @@ export const errorInterceptor = (error: any): Promise<ErrorResponse> => {
message = errMsg
} else {
// 处理特定状态码
switch (error.statusCode) {
switch (statusCode) {
case HTTP_STATUS.AUTHENTICATE:
toLogin = true
message = ERROR_MSG.AUTH_ERROR

4
src/api/request/request.ts
View File

@ -23,8 +23,8 @@ class HttpRequest {
url,
timeout: this.timeout,
})) as unknown as ResponseData<T>
return (await responseInterceptor(response)).data
const res = (await responseInterceptor(response)).data as any
return res?.data
} catch (error) {
return errorInterceptor(error) as any
}

140
src/pages/login/index.vue
View File

@ -48,23 +48,6 @@
</view>
<button class="phone_btn" @click="handleLogin">登录</button>
</view>
<!-- 多层身份弹窗 -->
<wd-popup
v-model="adminPopup"
safe-area-inset-bottom
position="bottom"
custom-style="border-radius: 20px 20px 0 0;padding-bottom: 30px;"
>
<view class="popup_box">
<view class="header_title"> 请选择身份 </view>
<view class="method_list">
<view v-for="(i, idx) in userAdmin" :key="idx" class="item" @click="chooseAdmin(i)">
{{ i.adminTypeName }}
</view>
</view>
</view>
</wd-popup>
</mj-page>
</template>
@ -74,10 +57,11 @@ import { ref, computed, nextTick, onMounted } from 'vue'
import {
getBindPhoneTypeApi,
sendCodeMessageApi,
getAdminTypeByPhoneApi,
smsLoginApi,
getUserInfoApi,
getAuthUrlApi,
wxLoginApi,
wxBindAccountApi,
} from '@/api'
import { setCache, getCache } from '@/utils'
import { getUserInfo as dx_getUserInfoApi } from '@/api/inspector/mine'
@ -129,12 +113,8 @@ async function fetchDXUserInfo() {
}
// 获取验证码
async function getCode() {
loginForm.value.phone = formatPhone.value.replace(/\s+/g, '')
if (!loginForm.value.phone) {
uni.showToast({
icon: 'none',
title: '请输入手机号',
})
if (!validatePhone()) {
hud.error('请输入正确的手机号')
return
}
try {
@ -161,76 +141,64 @@ async function handleLogin() {
})
return
}
uni.showLoading({
title: '登录中...',
})
getAdminTypeByPhone()
}
// 用户身份
async function getAdminTypeByPhone() {
const res = await getAdminTypeByPhoneApi({
phone: loginForm.value.phone,
})
userAdmin.value = res
if (userAdmin.value.length <= 1) {
// 非多个身份
loginForm.value.adminType = userAdmin.value[0].adminType
if (db.get('openid')) {
await wxBindAccount()
} else {
await smsLogin()
if (loginForm.value.adminType === 6) return
} else {
// 多个身份
uni.hideLoading()
adminPopup.value = true
}
}
async function smsLogin() {
uni.showLoading({
title: '登录中...',
hud.load({
task: async () => {
const token = await smsLoginApi(loginForm.value)
setToken(token)
await getUserInfo()
router.reLaunch('/pages/home/index')
},
option: '登录',
})
const res = await smsLoginApi(loginForm.value)
setToken(res)
const data = await getUserInfo()
}
if (!data.openid) {
// 初次注册
const authRes = await getAuthUrlApi()
// #ifdef H5
window.location.href = authRes
// #endif
// if (data.adminType === 16) {
// const authRes = await getAuthUrlApi();
// // #ifdef H5
// window.location.href = authRes.data;
// // #endif
// } else {
// fetchDXUserInfo();
// uni.reLaunch({
// url: '/pages/inspector/schedule/index',
// });
// }
} else {
router.reLaunch('/pages/home/index')
// let adminType = getCache('userInfo').adminType;
// if (adminType === 16) {
// uni.reLaunch({
// url: '/pages/home/index',
// });
// } else if (adminType === 6) {
// fetchDXUserInfo();
// uni.reLaunch({
// url: '/pages/inspector/schedule/index',
// });
// }
async function wxBindAccount() {
hud.load({
task: async () => {
await wxBindAccountApi(loginForm.value)
await getUserInfo()
router.reLaunch('/pages/home/index')
},
option: '登录',
})
}
async function wxLogin() {
const code = db.get('code')
if (!code) {
return
}
uni.hideLoading()
}
async function chooseAdmin(i) {
loginForm.value.adminType = i.adminType
adminPopup.value = false
await smsLogin()
if (loginForm.value.adminType === 6) return
// 移除code
db.pop('code')
hud.load({
task: async () => {
// 登录逻辑
const { accessToken, openid } = await wxLoginApi({
code,
})
db.set('openid', openid)
setToken(accessToken)
},
option: '微信自动登录',
})
}
onMounted(async () => {
// 清空token
db.pop('token')
// 尝试微信登录
wxLogin()
})
</script>
<style lang="scss" scoped>

108
src/pages/mine/prefectInformation/index.vue
View File

@ -1,5 +1,5 @@
<template>
<view class="page">
<mj-page class="page">
<BackBar v-if="pageType === 1" title="完善信息" />
<view class="info">
<view class="info_item info_header">
@ -53,30 +53,31 @@
>
<view class="confirm_box"> 是否确定退出登录？ </view>
</CustomPopup>
</view>
</mj-page>
</template>
<script setup>
import { ref, computed, onMounted, onUnmounted } from 'vue';
import { onLoad } from '@dcloudio/uni-app';
import { user } from '@/store';
import { updateUserInfoApi } from '@/api';
import { storeToRefs } from 'pinia';
import router from '@/router/router';
import CustomPopup from '@/components/CustomPopup/index.vue';
import { ref, computed, onMounted, onUnmounted } from 'vue'
import { onLoad } from '@dcloudio/uni-app'
import { user } from '@/store'
import { updateUserInfoApi } from '@/api'
import { storeToRefs } from 'pinia'
import router from '@/router/router'
import CustomPopup from '@/components/CustomPopup/index.vue'
// #ifdef H5
import { h5Authorization } from '@/store';
const { authorizedLogin } = h5Authorization();
import { h5Authorization } from '@/store'
import hud from '@/utils/hud'
const { authorizedLogin } = h5Authorization()
// #endif
const popupRef = ref(null);
const OSS_URL = import.meta.env.VITE_OSS_HOST;
const defaultAvatar = `${OSS_URL}/urm/default_avatar.png`;
const arrow = `${OSS_URL}/iconfont/down_arrow.png`;
const { logout, getUserInfo } = user();
const { userInfo } = storeToRefs(user());
const indicatorStyle = ref(`height: 50px;`);
const showCustomPopup = ref(false);
const pageType = ref(); // 1-非首次注册进入
const popupRef = ref(null)
const OSS_URL = import.meta.env.VITE_OSS_HOST
const defaultAvatar = `${OSS_URL}/urm/default_avatar.png`
const arrow = `${OSS_URL}/iconfont/down_arrow.png`
const { logout, getUserInfo } = user()
const { userInfo } = storeToRefs(user())
const indicatorStyle = ref(`height: 50px;`)
const showCustomPopup = ref(false)
const pageType = ref() // 1-非首次注册进入
const pickList = ref([
{
name: '从相册选择',
@ -88,24 +89,24 @@ const pickList = ref([
type: 2,
sourceType: 'camera',
},
]);
])
const info = ref({
avatar: '', // 图片id
avatarUrl: '',
id: '', // 用户id
nickName: '',
});
})
function handlePreview() {
if (!info.value.avatarUrl) return;
if (!info.value.avatarUrl) return
uni.previewImage({
urls: [info.value.avatarUrl],
current: 0,
});
})
}
function chooseUploadMethod(i) {
popupRef.value.close();
popupRef.value.close()
uni.chooseImage({
count: 1, // 最多可以选择的图片张数
sizeType: ['compressed', 'original'], // original 原图，compressed 压缩图，默认二者都有
@ -113,14 +114,14 @@ function chooseUploadMethod(i) {
success: res => {
router.navigateTo({
path: `/pages/mine/prefectInformation/cropper`,
query: { file: res.tempFilePaths[0] }
});
query: { file: res.tempFilePaths[0] },
})
},
fail: err => {
// 图片接口调用失败的回调函数
console.log('chooseImage fail', err);
console.log('chooseImage fail', err)
},
});
})
}
async function saveUpdate() {
@ -128,45 +129,50 @@ async function saveUpdate() {
uni.showToast({
icon: 'none',
title: '头像、昵称不能为空',
});
return;
})
return
}
uni.showLoading({ title: '更新中...' });
uni.showLoading({ title: '更新中...' })
try {
await updateUserInfoApi(info.value);
await getUserInfo();
uni.hideLoading();
router.redirectTo('/pages/mine/index');
await updateUserInfoApi(info.value)
await getUserInfo()
uni.hideLoading()
router.redirectTo('/pages/mine/index')
} catch (err) {
uni.hideLoading();
uni.hideLoading()
}
}
function handleConfirmPopup() {
showCustomPopup.value = false;
logout();
showCustomPopup.value = false
hud.load({
task: async () => {
await logout()
},
option: '退出登录',
})
}
onLoad(option => {
pageType.value = option.type ? Number(option.type) : undefined;
pageType.value = option.type ? Number(option.type) : undefined
uni.$on('filePathMsg', data => {
info.value.avatarUrl = data.filePath;
info.value.avatar = data.id;
pageType.value = data.type;
});
info.value.avatarUrl = data.filePath
info.value.avatar = data.id
pageType.value = data.type
})
for (let key in info.value) {
info.value[key] = userInfo.value[key];
info.value[key] = userInfo.value[key]
}
});
})
onMounted(() => {
// #ifdef H5
if (pageType.value === 1) return;
authorizedLogin();
if (pageType.value === 1) return
authorizedLogin()
// #endif
});
})
onUnmounted(() => {
uni.$off('filePathMsg');
});
uni.$off('filePathMsg')
})
</script>
<style lang="scss" scoped>

35
src/utils/db.ts
View File

@ -1,37 +1,38 @@
/* eslint-disable no-param-reassign */
import page from './page'
// 可以在不同的地方共享数据、传参
function get<T>(key?: string, defaultValue?: T): T {
if (!key) {
key = page.getPagePath()
}
const val = uni.getStorageSync(key)
return (val === undefined ? defaultValue : val) as T
if (!key) {
key = page.getPagePath()
}
const val = uni.getStorageSync(key)
return (val === undefined ? defaultValue : val) as T
}
// 设值
function set(key: string, value: any) {
uni.setStorageSync(key, value)
uni.setStorageSync(key, value)
}
// 弹出值
function pop<T>(key?: string, defaultValue?: T): T {
if (!key) {
key = page.getPagePath()
}
const value = uni.getStorageSync(key)
uni.removeStorageSync(key)
return value || defaultValue
if (!key) {
key = page.getPagePath()
}
const value = uni.getStorageSync(key)
uni.removeStorageSync(key)
return value || defaultValue
}
// 清空
function clear() {
uni.clearStorageSync()
uni.clearStorageSync()
}
export default {
get,
set,
pop,
clear,
get,
set,
pop,
clear,
}

84
src/utils/dict.ts
View File

@ -1,79 +1,85 @@
/* eslint-disable no-param-reassign */
import page from './page'
// 可以在不同的地方共享数据、传参
let _DATA: { [key: string]: any } = {}
function get<T>(key?: string, defaultValue?: T): T {
if (!key) {
key = page.getPagePath()
}
const val = _DATA[key]
return (val === undefined ? defaultValue : val) as T
if (!key) {
key = page.getPagePath()
}
const val = _DATA[key]
return (val === undefined ? defaultValue : val) as T
}
// 设值
function set(key: string, value: any) {
_DATA[key] = value
_DATA[key] = value
}
// 弹出值
function pop<T>(key?: string, defaultValue?: T): T {
if (!key) {
key = page.getPagePath()
}
const value = _DATA[key]
delete _DATA[key]
return value || defaultValue
if (!key) {
key = page.getPagePath()
}
const value = _DATA[key]
delete _DATA[key]
return value || defaultValue
}
// 清空
function clear() {
_DATA = {}
_DATA = {}
}
// 函数的key
function _pageFnObjKey(pageUrl: string) {
return pageUrl + '_mj_fn_obj'
return pageUrl + '_mj_fn_obj'
}
function _getPageFnObj(pageUrl: string) {
const key = _pageFnObjKey(pageUrl)
let fnObj = _DATA[key]
if (!fnObj) {
fnObj = {}
_DATA[key] = fnObj
}
return fnObj
if (!pageUrl) return undefined
const key = _pageFnObjKey(pageUrl)
let fnObj = _DATA[key]
if (!fnObj) {
fnObj = {}
_DATA[key] = fnObj
}
return fnObj
}
// 调用函数
function callFn(key: string, ...args: any) {
// 函数对象
const fn = _getPageFnObj(page.getPagePath())[key]
if (fn) {
// 直接调用
return fn(...args)
}
// console.log('callFn', _DATA)
// 函数对象
const obj = _getPageFnObj(page.getPagePath())
if (!obj) return
const fn = obj[key]
if (fn) {
// 直接调用
return fn(...args)
}
// console.log('callFn', _DATA)
}
// 存储函数
function setFn(key: string, fn: any) {
_getPageFnObj(page.getPagePath())[key] = fn
// console.log('setFn', _DATA)
const obj = _getPageFnObj(page.getPagePath())
if (!obj) return
obj[key] = fn
// console.log('setFn', _DATA)
}
function popPageFns(pageUrl: string) {
delete _DATA[_pageFnObjKey(pageUrl)]
// console.log('popPageFns', _DATA)
delete _DATA[_pageFnObjKey(pageUrl)]
// console.log('popPageFns', _DATA)
}
export default {
get,
set,
pop,
clear,
callFn,
setFn,
popPageFns,
get,
set,
pop,
clear,
callFn,
setFn,
popPageFns,
}

11
src/utils/page.ts
View File

@ -1,15 +1,16 @@
const DATA: { [key: string]: any } = {}
function getPage() {
const pages = getCurrentPages()
return pages[pages.length - 1]
const pages = getCurrentPages()
return pages?.length ? pages[pages.length - 1] : undefined
}
function getPagePath() {
return '/' + getPage().route
const route = getPage()?.route
return route ? '/' + route : ''
}
export default {
getPage,
getPagePath,
getPage,
getPagePath,
}