diff --git a/.env b/.env index 490e653..01cbb6c 100644 --- a/.env +++ b/.env @@ -1,13 +1,14 @@ # ******************** start 开发环境 start ******************** -VITE_APP_DEV_SERVICE =http://localhost:48080/app-api +#VITE_APP_DEV_SERVICE =http://localhost:48080/app-api +VITE_APP_DEV_SERVICE =https://stgl.pj.gov.cn/app-api # VITE_APP_DEV_SERVICE =http://123.156.228.134:48080/app-api # ******************** end 开发环境 end ******************** - + # ******************** start 生产环境 start ******************** -VITE_APP_PROD_SERVICE = http://123.156.228.134:48080/app-api - -# ******************** end 生产环境 end ******************** \ No newline at end of file +#VITE_APP_PROD_SERVICE = http://123.156.228.134:48080/app-api +VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/app-api +# ******************** end 生产环境 end ******************** diff --git a/src/manifest.json b/src/manifest.json index 900e63f..a8005d5 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,28 +1,28 @@ { - "name": "", - "appid": "", - "description": "", - "versionName": "1.0.0", - "versionCode": "100", - "transformPx": false, + "name" : "", + "appid" : "", + "description" : "浦江县机关事务智慧后勤一体化平台", + "versionName" : "1.0.0", + "versionCode" : "100", + "transformPx" : false, /* 5+App特有相关 */ - "app-plus": { - "usingComponents": true, - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 + "app-plus" : { + "usingComponents" : true, + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 }, /* 模块配置 */ - "modules": {}, + "modules" : {}, /* 应用发布信息 */ - "distribute": { + "distribute" : { /* android打包配置 */ - "android": { - "permissions": [ + "android" : { + "permissions" : [ "", "", "", @@ -41,38 +41,39 @@ ] }, /* ios打包配置 */ - "ios": {}, + "ios" : {}, /* SDK配置 */ - "sdkConfigs": {} + "sdkConfigs" : {} } }, /* 快应用特有相关 */ - "quickapp": {}, + "quickapp" : {}, /* 小程序特有相关 */ - "mp-weixin": { - "appid": "", - "setting": { - "urlCheck": false + "mp-weixin" : { + "appid" : "", + "setting" : { + "urlCheck" : false }, - "usingComponents": true + "usingComponents" : true }, - "mp-alipay": { - "usingComponents": true + "mp-alipay" : { + "usingComponents" : true }, - "mp-baidu": { - "usingComponents": true + "mp-baidu" : { + "usingComponents" : true }, - "mp-toutiao": { - "usingComponents": true + "mp-toutiao" : { + "usingComponents" : true }, - "uniStatistics": { - "enable": false + "uniStatistics" : { + "enable" : false }, - "vueVersion": "3", - "h5": { - "router": { - "base": "/", - "mode": "hash" - } + "vueVersion" : "3", + "h5" : { + "router" : { + "base" : "/h5/", + "mode" : "hash" + }, + "title" : "浦江县机关事务智慧后勤一体化平台" } -} \ No newline at end of file +} diff --git a/src/pages/boxes/apply-list.vue b/src/pages/boxes/apply-list.vue index 8a99e06..4747812 100644 --- a/src/pages/boxes/apply-list.vue +++ b/src/pages/boxes/apply-list.vue @@ -109,10 +109,10 @@ const doCancelApply = async (v: any) => { 审批状态: - 审批中 - 审批通过 - 审批不通过 - 已取消 + 审批中 + 审批通过 + 审批不通过 + 已取消 diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index 2206265..8bafdfb 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -18,11 +18,11 @@ const data = { const state = reactive({ wallet: [], - userInfo: {} + userInfo: {}, }) -onLoad(() => { +onLoad((options) => { }); onShow(() => { getUserInfo() @@ -46,7 +46,12 @@ const doLogin = async () => { title: '登录中...', mask: true }); - const { data: authData } = await userApi.auth("test"); + + const url = window.location.href; + const params = new URL(url).searchParams; + const token = params.get('uabaseToken'); // 获取 uabaseToken 参数值 + console.log('Token:', token); + const { data: authData } = await userApi.auth(token); uni.setStorageSync(tokenKey, authData) const { data: userData } = await userApi.userInfo(); uni.setStorageSync(userInfoKey, userData) @@ -119,4 +124,4 @@ const doLogout = async () => { border-bottom: 1px solid #fafafa; margin-bottom: 40rpx; } - \ No newline at end of file +