diff --git a/components/LoginPopup/LoginPopup.vue b/components/LoginPopup/LoginPopup.vue index 3b11551..a72cb58 100644 --- a/components/LoginPopup/LoginPopup.vue +++ b/components/LoginPopup/LoginPopup.vue @@ -12,7 +12,7 @@ class="avatar-selector custom-button" > - 获取头像 + 点击获取头像 { + const idx = Math.floor(Math.random() * festivalNames.length); + return festivalNames[idx]; +} + const open = () => { popupRef.value.open(); }; @@ -62,11 +75,11 @@ const confirmLogin = async () => { const platform = getPlatformProvider(); if (platform === "mp-weixin") { const code = await wxLogin(); - const imageUrl = await uploadImage(avatarUrl.value); + const imageUrl = avatarUrl.value ? await uploadImage(avatarUrl.value) : ""; const loginRes = await apiLogin({ code, - nickname: nickname.value, + nickname: nickname.value || getFestivalName(), avatarUrl: imageUrl, platform: "wx", }); diff --git a/manifest.json b/manifest.json index b69f564..46596a4 100644 --- a/manifest.json +++ b/manifest.json @@ -1,73 +1,74 @@ { - "name" : "tpl-mini", - "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 - }, - /* 模块配置 */ - "modules" : {}, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : {}, - /* SDK配置 */ - "sdkConfigs" : {} - } + "name": "tpl-mini", + "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 }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "wx3fcc07a061af049a", - "setting" : { - "urlCheck" : false - }, - "usingComponents" : true + /* 模块配置 */ + "modules": {}, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": {}, + /* SDK配置 */ + "sdkConfigs": {} + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "wx3fcc07a061af049a", + "setting": { + "urlCheck": false }, - "mp-alipay" : { - "usingComponents" : true, - "appid" : "2021006125616610" - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false - }, - "vueVersion" : "3" + "usingComponents": true, + "lazyCodeLoading": "requiredComponents" + }, + "mp-alipay": { + "usingComponents": true, + "appid": "2021006125616610" + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "vueVersion": "3" } diff --git a/pages.json b/pages.json index a3e79fb..82def5f 100644 --- a/pages.json +++ b/pages.json @@ -178,10 +178,5 @@ } ] }, - "uniIdRouter": {}, - "permission": { - "scope.userLocation": { - "desc": "用于获取您的当前位置,以显示附近景点和打卡功能" - } - } + "uniIdRouter": {} } diff --git a/pages/make/index.vue b/pages/make/index.vue index 18d3f45..ffd04cb 100644 --- a/pages/make/index.vue +++ b/pages/make/index.vue @@ -517,7 +517,7 @@ const targetName = ref("祝您"); const signatureName = ref(userStore?.userInfo?.nickName || "xxx"); const userAvatar = ref( userStore?.userInfo?.avatarUrl || - "https://file.lihailezzc.com/resource/b48c41054c2633c478463ac1b1f1ca23.png", + "https://file.lihailezzc.com/resource/96023631c6ab9c3496b7620097af3d6f.png", ); const blessingText = ref({}); diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index 4540d11..2dd9537 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -18,7 +18,7 @@ - 🔥 +