From dbe56cf44669f9a94f50bb5dcc7f360ef41d2f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=B9=8F?= <877617829@qq.com> Date: Wed, 20 Nov 2024 00:55:15 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E3=80=81?= =?UTF-8?q?=E6=96=B9=E5=BD=A2=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/auth/login.vue | 2 +- pages/config/index.vue | 2 +- static/scss/global.scss | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pages/auth/login.vue b/pages/auth/login.vue index 6baea0d..2a59752 100644 --- a/pages/auth/login.vue +++ b/pages/auth/login.vue @@ -63,7 +63,7 @@ // 点击logo const logoTap = () => { if (!config.ENABLE_CONFIG_PAGE) { return } - uni.$snowy.tab.reLaunch('/pages/config/index') + uni.$snowy.tab.navigateTo('/pages/config/index') } // 获取租户 const getTenSelector = async () => { diff --git a/pages/config/index.vue b/pages/config/index.vue index 0443a4b..fd1a8ff 100644 --- a/pages/config/index.vue +++ b/pages/config/index.vue @@ -97,7 +97,7 @@ // 设置当前租户 store.commit('SET_tenantDomain', store.getters.allEnv[store.getters.envKey].tenantDomain) - uni.$snowy.tab.navigateTo(`/pages/auth/login`) + uni.$snowy.tab.reLaunch(`/pages/auth/login`) } // 新增 const add = () => { diff --git a/static/scss/global.scss b/static/scss/global.scss index 0144c54..b851c02 100644 --- a/static/scss/global.scss +++ b/static/scss/global.scss @@ -133,7 +133,12 @@ $snowy-item-margin-bottom: 5rpx; .snowy-z-paging-item { @extend .snowy-item; - margin: 0 $snowy-left-right $snowy-item-margin-bottom $snowy-left-right; + @if $snowy-style == 'circular' { + margin: 0 $snowy-left-right $snowy-item-margin-bottom $snowy-left-right; + } + @if $snowy-style == 'square' { + margin: 0 0 $snowy-item-margin-bottom 0; + } } .snowy-padding { -- Gitee From ff2b4fa1db3f87f46571ad9e8e2273c0084e0e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=B9=8F?= <877617829@qq.com> Date: Wed, 20 Nov 2024 00:58:42 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/snowy/modal.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/snowy/modal.js b/plugins/snowy/modal.js index fa4ca75..336ae7d 100644 --- a/plugins/snowy/modal.js +++ b/plugins/snowy/modal.js @@ -69,6 +69,10 @@ export default { }, // 关闭遮罩层 closeLoading() { - uni.hideLoading() + try { + uni.hideLoading() + }catch (e) { + console.log(e) + } } } \ No newline at end of file -- Gitee From ef1e9decde6eeaad50f34877e9e18052be02844e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=B9=8F?= <877617829@qq.com> Date: Sat, 30 Nov 2024 14:58:23 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=99=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/snowy/snowy-sel-picker/snowy-sel-picker.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/snowy/snowy-sel-picker/snowy-sel-picker.vue b/components/snowy/snowy-sel-picker/snowy-sel-picker.vue index 8025a66..d09d5ea 100644 --- a/components/snowy/snowy-sel-picker/snowy-sel-picker.vue +++ b/components/snowy/snowy-sel-picker/snowy-sel-picker.vue @@ -265,7 +265,7 @@ if (state === CallbackState.ERROR) { return uni.$snowy.modal.alert(msg) } - + curSelData.value = [] for (let item of curSelDataKey.value) { if (uni.$snowy.tool.isEmpty(data)) { // 无法找到已选中数据 @@ -298,6 +298,7 @@ curSelData.value.push(notFindSelDataItem) continue; } + curSelData.value.push(findSelDataItem) } }) @@ -309,6 +310,7 @@ if (state === CallbackState.ERROR) { return uni.$snowy.modal.alert(msg) } + curSelData.value = [] for (let item of curSelDataKey.value) { // 返回数据为空 if (uni.$snowy.tool.isEmpty(data)) { -- Gitee From 54e7ec3ddabd6f049122fd3d1f9d90c1b46f9bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=B9=8F?= <877617829@qq.com> Date: Sat, 30 Nov 2024 15:00:49 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E6=A0=91=E9=80=89=E6=8B=A9=E5=99=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/snowy/snowy-tree-picker/snowy-tree-picker.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/snowy/snowy-tree-picker/snowy-tree-picker.vue b/components/snowy/snowy-tree-picker/snowy-tree-picker.vue index ebabfb6..662d9f4 100644 --- a/components/snowy/snowy-tree-picker/snowy-tree-picker.vue +++ b/components/snowy/snowy-tree-picker/snowy-tree-picker.vue @@ -84,7 +84,7 @@ }, placeholder: { type: String, - default: "请选择机构", + default: "请选择", required: false }, isTopLevel: { -- Gitee From 4bf43d878030ba098fadf0fdf406570c2405e585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=B9=8F?= <877617829@qq.com> Date: Tue, 3 Dec 2024 00:36:05 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 6592ac7..c1befef 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -126,7 +126,7 @@ const handleLogout = () => { uni.$snowy.modal.confirm('确定注销并退出系统吗？').then(() => { // 退出 - store.dispatch('LogOut').then(() => { + store.dispatch('LogOut').then(() => {}).finally(()=>{ uni.$snowy.tab.reLaunch(config.NO_TOKEN_BACK_URL) }) }) -- Gitee From e2df835f245d799d061c09cd81d8b3da46a222df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=B9=8F?= <877617829@qq.com> Date: Fri, 13 Dec 2024 22:16:11 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=82=E6=95=B0=E7=BC=93=E5=AD=98=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- store/modules/global.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store/modules/global.js b/store/modules/global.js index 6f299cd..eff0efe 100644 --- a/store/modules/global.js +++ b/store/modules/global.js @@ -35,7 +35,7 @@ export default { // 刷新参数 refreshParam: storage.get(STORE_KEY_ENUM.refreshParam) || null, // 通用参数 - commonParam: storage.get(STORE_KEY_ENUM.refreshParam) || null, + commonParam: storage.get(STORE_KEY_ENUM.commonParam) || null, }, mutations: { SET_envKey: (state, envKey) => { -- Gitee From 5a13859eb03afec9bcd86a940eca4a3a53df47b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=B9=8F?= <877617829@qq.com> Date: Sat, 14 Dec 2024 15:32:08 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=E5=B9=B6=E8=B0=83=E6=95=B4=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env.js | 2 +- pages/home/item.vue | 5 ----- uni.scss | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/env.js b/env.js index 25330c7..3dd0ed1 100644 --- a/env.js +++ b/env.js @@ -3,7 +3,7 @@ const defaultAllEnv = { local: { name: "本地环境", // 服务端baseUrl - baseUrl: "http://192.168.0.104:82", + baseUrl: "http://127.0.0.1:82", // 主租户域（企业版多租户使用：注意与后端snowy.config.common.front-url进行对应） mainTenantDomain: "http://localhost:81", // 默认当前租户域（可以是子租户域也可以是主租户域） diff --git a/pages/home/item.vue b/pages/home/item.vue index a5e12c2..5505acb 100644 --- a/pages/home/item.vue +++ b/pages/home/item.vue @@ -4,10 +4,6 @@ - - - - @@ -24,7 +20,6 @@