diff --git a/api/api.js b/api/api.js index 8c1b2ff..229b536 100644 --- a/api/api.js +++ b/api/api.js @@ -1,4 +1,5 @@ import http from './http.js' +import utils from '../utils/utils.js' const config = { //示例 diff --git a/api/http.js b/api/http.js index 61d78eb..3c18457 100644 --- a/api/http.js +++ b/api/http.js @@ -1,5 +1,6 @@ import Vue from 'vue' +import utils from '../utils/utils.js' function http(uri, data, callback, method = 'GET', showLoading, title) { @@ -29,9 +30,7 @@ function http(uri, data, callback, method = 'GET', showLoading, title) { res.data.message == '操作失败,用户不存在!'){ uni.removeStorageSync('token') console.error('登录过期'); - uni.navigateTo({ - url: '/pages/login/login' - }) + utils.toLogin() } if(res.statusCode == 200 && res.data.code != 200){ diff --git a/config.js b/config.js index 0f2f0eb..38f3da1 100644 --- a/config.js +++ b/config.js @@ -32,18 +32,32 @@ const config = { // 默认配置 const defaultConfig = { mapKey : 'XMBBZ-BCPCV-SXPPQ-5Y7MY-PHZXK-YFFVU', - aliOss : { - url : 'https://tennis-oss.xzaiyp.top/', - config : { + // aliOss : { + // url : 'https://tennis-oss.xzaiyp.top/', + // config : { + // //桶的地址 + // region: 'oss-cn-guangzhou', + // //id + // accessKeyId:'LTAI5tNycA46YTwm383dRvMV', + // //密钥 + // accessKeySecret:'tAdbYQCmdur6jbZ8hjvgB7T1Z52mIG', + // //桶的名字 + // bucket: 'zhuoqiu-image', + // endpoint:'oss-cn-guangzhou.aliyuncs.com', + // } + // }, + aliOss: { + url: 'https://image.hhlm1688.com/', + config: { //桶的地址 region: 'oss-cn-guangzhou', //id - accessKeyId:'LTAI5tNycA46YTwm383dRvMV', + accessKeyId: 'LTAI5tQSs47izVy8DLVdwUU9', //密钥 - accessKeySecret:'tAdbYQCmdur6jbZ8hjvgB7T1Z52mIG', + accessKeySecret: 'qHI7C3PaXYZySr84HTToviC71AYlFq', //桶的名字 - bucket: 'zhuoqiu-image', - endpoint:'oss-cn-guangzhou.aliyuncs.com', + bucket: 'hanhaiimage', + endpoint: 'oss-cn-shenzhen.aliyuncs.com', } }, } diff --git a/pages/center/center.vue b/pages/center/center.vue index dfe0ffe..17bbabf 100644 --- a/pages/center/center.vue +++ b/pages/center/center.vue @@ -29,7 +29,7 @@ {{ userInfo.nickName }} - + diff --git a/utils/utils.js b/utils/utils.js index 0314556..88bcee7 100644 --- a/utils/utils.js +++ b/utils/utils.js @@ -132,6 +132,23 @@ export function navigateBack(num = -1){ uni.navigateBack(num) } +/** + * 登录跳转函数,防止短时间内多次调用 + * @returns {Function} 节流处理后的登录跳转函数 + */ +export const toLogin = function(){ + let time = 0 + return () => { + if(new Date().getTime() - time < 1000){ + return + } + time = new Date().getTime() + uni.navigateTo({ + url: '/pages/login/login' + }) + } +}() + export default { toArray, generateUUID, @@ -142,5 +159,6 @@ export default { getHrefParams, deepMergeObject, navigateTo, - navigateBack + navigateBack, + toLogin, } \ No newline at end of file