diff --git a/config.js b/config.js index dee40a5..5d818dd 100644 --- a/config.js +++ b/config.js @@ -1,4 +1,3 @@ - import Vue from 'vue' import api from '@/api/api.js' import utils from './utils/utils.js' @@ -12,30 +11,30 @@ const type = 'dev' // 环境配置 const config = { - dev : { - baseUrl : 'http://www.gcosc.fun:82', + dev: { + baseUrl: 'http://www.gcosc.fun:82', }, - prod : { - baseUrl : 'http://xxx.xxx.xxx/xxx', + prod: { + baseUrl: 'http://xxx.xxx.xxx/xxx', } } // 默认配置 const defaultConfig = { - mapKey : 'XMBBZ-BCPCV-SXPPQ-5Y7MY-PHZXK-YFFVU', - aliOss : { - url : 'https://oss.mxqih.top/', - config : { + mapKey: 'XMBBZ-BCPCV-SXPPQ-5Y7MY-PHZXK-YFFVU', + aliOss: { + url: 'https://tennis-oss.xzaiyp.top/', + config: { //桶的地址 region: 'oss-cn-guangzhou', //id - accessKeyId:'LTAI5tNycA46YTwm383dRvMV', + accessKeyId: 'LTAI5tNycA46YTwm383dRvMV', //密钥 - accessKeySecret:'tAdbYQCmdur6jbZ8hjvgB7T1Z52mIG', + accessKeySecret: 'tAdbYQCmdur6jbZ8hjvgB7T1Z52mIG', //桶的名字 bucket: 'zhuoqiu-image', - endpoint:'oss-cn-guangzhou.aliyuncs.com' + endpoint: 'oss-cn-guangzhou.aliyuncs.com', } }, } diff --git a/pages.json b/pages.json index ff3550f..42a7ce0 100644 --- a/pages.json +++ b/pages.json @@ -1,6 +1,10 @@ { - "pages": [ - { + "pages": [{ + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "登录" + } + }, { "path": "pages/index/index", "style": { "navigationBarTitleText": "打卡" @@ -12,12 +16,6 @@ "navigationBarTitleText": "我的" } }, - { - "path": "pages/login/login", - "style": { - "navigationBarTitleText": "登录" - } - }, { "path": "pages/login/wxUserInfo", "style": { diff --git a/pages/login/wxUserInfo.vue b/pages/login/wxUserInfo.vue index dfb44ca..3f962b4 100644 --- a/pages/login/wxUserInfo.vue +++ b/pages/login/wxUserInfo.vue @@ -20,7 +20,7 @@