diff --git a/src/api/index.js b/src/api/index.js index b3e1835..77ec5e5 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,6 +1,9 @@ import server from './server'; // 公共 +export const douyinMiniAppLoginAndSync = params => server.post({ url: '/user/douyinMiniAppLoginAndSync', ...params }); // 抖音小程序授权 + + export const login = params => server.post({ url: '/Admino/AdminUser/login', ...params }); // 登录 export const stadiumFind = params => server.post({ url: '/stadium/find', ...params }); // 登录 export const stadiumBookList = params => server.post({ url: '/stadium/book/list', ...params }); // 订场列表 diff --git a/src/api/server.js b/src/api/server.js index abdd9d8..cc8f3ac 100644 --- a/src/api/server.js +++ b/src/api/server.js @@ -35,26 +35,26 @@ server.interceptors.response.use( loading.hide(response.config.loading); if(response?.data?.code === 0)return formatResponse(response); console.error(`get ${response?.config?.url} err -> `, response) - // return errorHandle({ - // Catch: response?.config?.catch || false, - // content: response?.data?.smsg ?? '请求失败', - // data: response, - // success: () => { - // // 登录超时 - // if(response?.data?.error === '201')loginHandle(); - // if(response?.data?.error === '704'&&response?.data?.smsg === 'ustoken不能为空')loginHandle(); - // } - // }) + return errorHandle({ + Catch: response?.config?.catch || false, + content: response?.data?.message ?? '请求失败', + data: response, + success: () => { + // 登录超时 + // if(response?.data?.error === '201')loginHandle(); + // if(response?.data?.error === '704'&&response?.data?.smsg === 'ustoken不能为空')loginHandle(); + } + }) }, error => { loading.hide(error.config.loading); console.error('server.interceptors.response error -> ', error); - // return errorHandle({ - // Catch: error?.config?.catch || false, - // // 404 拦截 data 会存在错误信息 - // content: error?.data ?? error?.errMsg ?? '请求失败', - // data: error, - // }) + return errorHandle({ + Catch: error?.config?.catch || false, + // 404 拦截 data 会存在错误信息 + content: error?.data ?? error?.errMsg ?? '请求失败', + data: error, + }) } ) diff --git a/src/pages.json b/src/pages.json index d7b8c81..a30ccb1 100644 --- a/src/pages.json +++ b/src/pages.json @@ -15,6 +15,17 @@ ], "subpackages": [ { + "root": "subpackage/authorize", + "pages": [ + { + "path": "pages/index", + "style": { + "navigationBarTitleText": "登录" + } + } + ] + }, + { "root": "subpackage/order", "pages": [ { diff --git a/src/subpackage/authorize/api/index.js b/src/subpackage/authorize/api/index.js new file mode 100644 index 0000000..2b33c31 --- /dev/null +++ b/src/subpackage/authorize/api/index.js @@ -0,0 +1,7 @@ +import server from '@/api/server'; + +// 公共 +export const douyinMiniAppBaseAuth = params => server.post({ url: '/user/douyinMiniAppBaseAuth', ...params }); // 抖音小程序code登录 + + + diff --git a/src/subpackage/authorize/pages/index.vue b/src/subpackage/authorize/pages/index.vue new file mode 100644 index 0000000..80819e8 --- /dev/null +++ b/src/subpackage/authorize/pages/index.vue @@ -0,0 +1,131 @@ + + + + + \ No newline at end of file diff --git a/src/subpackage/authorize/static/images/authorize.png b/src/subpackage/authorize/static/images/authorize.png new file mode 100644 index 0000000..47a57f2 Binary files /dev/null and b/src/subpackage/authorize/static/images/authorize.png differ diff --git a/src/utils/polish.js b/src/utils/polish.js index 86f6a91..e14d917 100644 --- a/src/utils/polish.js +++ b/src/utils/polish.js @@ -89,6 +89,16 @@ export function jsonPar(json){ return JSON.parse(decodeURIComponent(decodeURIComponent(json))) } +export function showLoad(title='加载中', mask=true){ + uni.showLoading({ + mask, + title, + }) +} +export function hideLoad(){ + uni.hideLoading() +} + export default { routeTo,