提交 3b4aadff 作者: 方治民

Merge branch '3.x' of https://gitlab.yiring.com/basic/basic-uniapp-v3 into examples

# API 接口地址 # API 接口地址
VITE_GLOB_API_URL=http://127.0.0.1:8081 VITE_GLOB_API_URL=http://192.168.0.110:8081
# API 接口地址前缀 # API 接口地址前缀
VITE_GLOB_API_URL_PREFIX=/api VITE_GLOB_API_URL_PREFIX=/api
{ {
"name": "basic-app", "name": "basic-app",
"version": "1.0.0", "version": "1.0.1",
"description": "APP 基础工程", "description": "APP 基础工程",
"keywords": [ "keywords": [
"app", "app",
...@@ -88,9 +88,9 @@ ...@@ -88,9 +88,9 @@
"dayjs": "^1.11.11", "dayjs": "^1.11.11",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"nanoid": "^5.0.7", "nanoid": "^5.0.7",
"pinia": "^2.1.7", "pinia": "2.0.36",
"pinyin-pro": "^3.22.2", "pinyin-pro": "^3.22.2",
"qs": "~6.12.1", "qs": "6.9.7",
"stompjs": "^2.3.3", "stompjs": "^2.3.3",
"urijs": "^1.19.11", "urijs": "^1.19.11",
"vue": "3.4.21", "vue": "3.4.21",
......
...@@ -75,14 +75,14 @@ importers: ...@@ -75,14 +75,14 @@ importers:
specifier: ^5.0.7 specifier: ^5.0.7
version: 5.0.7 version: 5.0.7
pinia: pinia:
specifier: ^2.1.7 specifier: 2.0.36
version: 2.1.7(typescript@5.4.5)(vue@3.4.21(typescript@5.4.5)) version: 2.0.36(typescript@5.4.5)(vue@3.4.21(typescript@5.4.5))
pinyin-pro: pinyin-pro:
specifier: ^3.22.2 specifier: ^3.22.2
version: 3.22.2 version: 3.22.2
qs: qs:
specifier: ~6.12.1 specifier: 6.9.7
version: 6.12.1 version: 6.9.7
stompjs: stompjs:
specifier: ^2.3.3 specifier: ^2.3.3
version: 2.3.3 version: 2.3.3
...@@ -5238,12 +5238,12 @@ packages: ...@@ -5238,12 +5238,12 @@ packages:
resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
engines: {node: '>=6'} engines: {node: '>=6'}
pinia@2.1.7: pinia@2.0.36:
resolution: {integrity: sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==} resolution: {integrity: sha512-4UKApwjlmJH+VuHKgA+zQMddcCb3ezYnyewQ9NVrsDqZ/j9dMv5+rh+1r48whKNdpFkZAWVxhBp5ewYaYX9JcQ==}
peerDependencies: peerDependencies:
'@vue/composition-api': ^1.4.0 '@vue/composition-api': ^1.4.0
typescript: '>=4.4.4' typescript: '>=4.4.4'
vue: ^2.6.14 || ^3.3.0 vue: ^2.6.14 || ^3.2.0
peerDependenciesMeta: peerDependenciesMeta:
'@vue/composition-api': '@vue/composition-api':
optional: true optional: true
...@@ -5436,14 +5436,14 @@ packages: ...@@ -5436,14 +5436,14 @@ packages:
resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
engines: {node: '>=0.6'} engines: {node: '>=0.6'}
qs@6.12.1:
resolution: {integrity: sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==}
engines: {node: '>=0.6'}
qs@6.5.3: qs@6.5.3:
resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==} resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==}
engines: {node: '>=0.6'} engines: {node: '>=0.6'}
qs@6.9.7:
resolution: {integrity: sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==}
engines: {node: '>=0.6'}
query-string@6.14.1: query-string@6.14.1:
resolution: {integrity: sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==} resolution: {integrity: sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==}
engines: {node: '>=6'} engines: {node: '>=6'}
...@@ -13041,7 +13041,7 @@ snapshots: ...@@ -13041,7 +13041,7 @@ snapshots:
pify@4.0.1: pify@4.0.1:
optional: true optional: true
pinia@2.1.7(typescript@5.4.5)(vue@3.4.21(typescript@5.4.5)): pinia@2.0.36(typescript@5.4.5)(vue@3.4.21(typescript@5.4.5)):
dependencies: dependencies:
'@vue/devtools-api': 6.6.3 '@vue/devtools-api': 6.6.3
vue: 3.4.21(typescript@5.4.5) vue: 3.4.21(typescript@5.4.5)
...@@ -13225,12 +13225,10 @@ snapshots: ...@@ -13225,12 +13225,10 @@ snapshots:
dependencies: dependencies:
side-channel: 1.0.6 side-channel: 1.0.6
qs@6.12.1:
dependencies:
side-channel: 1.0.6
qs@6.5.3: {} qs@6.5.3: {}
qs@6.9.7: {}
query-string@6.14.1: query-string@6.14.1:
dependencies: dependencies:
decode-uri-component: 0.2.2 decode-uri-component: 0.2.2
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"name" : "Beta App", "name" : "Beta App",
"appid" : "__UNI__2E9441A", "appid" : "__UNI__2E9441A",
"description" : "APP 基础工程", "description" : "APP 基础工程",
"versionName" : "1.0.0", "versionName" : "1.0.1",
"versionCode" : 10000, "versionCode" : 10001,
"transformPx" : false, "transformPx" : false,
"locale" : "zh-Hans", "locale" : "zh-Hans",
"vueVersion" : "3", "vueVersion" : "3",
......
...@@ -498,7 +498,8 @@ ...@@ -498,7 +498,8 @@
background-color: #fff; background-color: #fff;
box-sizing: border-box; box-sizing: border-box;
padding: 0 50rpx; padding: 0 50rpx;
font-family: Source Han Sans CN; font-family: -apple-system-font, BlinkMacSystemFont, 'Droid Sans', 'Noto Sans', 'PingFang SC', 'Heiti SC',
'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', SimSun, sans-serif;
} }
.text { .text {
......
...@@ -11,7 +11,7 @@ export function checkUpgrade(toast = false) { ...@@ -11,7 +11,7 @@ export function checkUpgrade(toast = false) {
} }
checkVersion() checkVersion()
.then((res) => { .then((res) => {
if (toast && res?.result?.code === 0) { if (toast && res?.code === 0) {
Message.toast('已是最新版本~') Message.toast('已是最新版本~')
} }
}) })
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论