diff --git a/components/snowy/snowy-sel-picker/snowy-sel-picker.vue b/components/snowy/snowy-sel-picker/snowy-sel-picker.vue index 8025a661a34ee41e117280a2ed38e66ca3cb4dae..d09d5ea4091e67d671779e4be83e3485e8ff5ac6 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)) { diff --git a/components/snowy/snowy-tree-picker/snowy-tree-picker.vue b/components/snowy/snowy-tree-picker/snowy-tree-picker.vue index ebabfb619d258d120ae4c3f87c774eb19e4955fe..662d9f490332e120a166be4e1fa044658609ac80 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: { diff --git a/env.js b/env.js index 25330c7f9d034c51432a43202fb226b94cc8f35a..3dd0ed11e05e1c7ee0a7495bd11244ebdb7625ba 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/auth/login.vue b/pages/auth/login.vue index 6baea0def6eadd456a05df1ed93b78ba15c9c23a..2a597528eea969855425f67b4adc455729dbcc98 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 0443a4b71d96011f96f8fcf09ea6b90cd0c847bf..fd1a8ff8f28a48c3d798f1aacfd3d6484ba86479 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/pages/home/item.vue b/pages/home/item.vue index a5e12c2116c910ca09e873ad7f9f3d3804fdc0cf..5505acb86a0f9d641505565fa80972acc0cf23c1 100644 --- a/pages/home/item.vue +++ b/pages/home/item.vue @@ -4,10 +4,6 @@ - - - - @@ -24,7 +20,6 @@