diff --git a/.env.development b/.env.development index eaa328f..18f601a 100644 --- a/.env.development +++ b/.env.development @@ -9,9 +9,9 @@ VITE_APP_ENV='development' # 开发环境 VITE_APP_BASE_API='/dev-api' # # 开发环境 接口代理地址 -#VITE_APP_PROXY_API='http://192.168.1.222:8080' +VITE_APP_PROXY_API='http://192.168.0.222:8080' # 开发环境 接口代理地址 -VITE_APP_PROXY_API='http://192.168.0.178:8080' +#VITE_APP_PROXY_API='http://192.168.0.199:8080' # 图片基础地址 VITE_IMG_URL='http://192.168.1.222:8080' diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 014ba1d..6f0bdd6 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -29,6 +29,7 @@
+
{{ userStore.nickname }}
头像
@@ -245,9 +246,14 @@ watch( .avatar-wrapper { margin-top: 5px; - // margin-left: 20px; position: relative; - + display: flex; + align-items: center; + .username { + font-size: 12px; + margin-top: 10px; + margin-right: 10px; + } .user-avatar { cursor: pointer; width: 40px; diff --git a/src/views/system/Sdb/SdbCashier/index.vue b/src/views/system/Sdb/SdbCashier/index.vue index 599efc0..2d6b387 100644 --- a/src/views/system/Sdb/SdbCashier/index.vue +++ b/src/views/system/Sdb/SdbCashier/index.vue @@ -175,7 +175,7 @@ 部分缴纳 - + diff --git a/src/views/system/version/index.vue b/src/views/system/version/index.vue index 5f9360f..823a5e2 100644 --- a/src/views/system/version/index.vue +++ b/src/views/system/version/index.vue @@ -59,7 +59,12 @@ android - + + + @@ -76,6 +81,11 @@ + + + + + @@ -83,7 +93,7 @@ - + @@ -112,7 +122,7 @@ vivo 应用宝 荣耀 - ios + ios @@ -316,13 +326,13 @@ function handleChangePlatform() { form.value.downloadUrl = ''; form.value.channel = ''; if (form.value.platform === 'ios') { - form.value.channel = 'ios'; + form.value.channel = 'phone'; handleChangeChannel(form.value.channel); } - handleGetVersionlast(); + handleGetVersionList(); } -function handleGetVersionlast() { +function handleGetVersionList() { getPastVersion(form.value.platform, form.value.appChannel).then((res) => { getlastVersionlist.value = res.data; form.value.minVersionCode = getlastVersionlist.value[getlastVersionlist.value.length - 1] @@ -338,7 +348,7 @@ const channelUrl = { 'vivo': 'vivomarket://details?id=', 'honor': 'market://details?id=', 'yyb': 'tmast://appdetails?pname=', - 'ios': 'itms-apps://apps.apple.com/cn/app/id' + 'phone': 'itms-apps://apps.apple.com/cn/app/id6785337718' }; function handleChangeChannel(val: string) { form.value.downloadUrl = channelUrl[val];