diff --git a/.env.development b/.env.development index fbcc74b..b8ccd8b 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ VITE_APP_NAME=后台管理(开发环境) -VITE_API_URL=http://127.0.0.1:9200/api +#VITE_API_URL=http://127.0.0.1:9200/api #VITE_SERVER_API_URL=http://127.0.0.1:8000/api diff --git a/dist.zip b/dist.zip deleted file mode 100644 index d7e7b24..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/index.html b/index.html index e45f55e..737328a 100644 --- a/index.html +++ b/index.html @@ -64,5 +64,10 @@ + diff --git a/src/api/house/houseInfo/model/index.ts b/src/api/house/houseInfo/model/index.ts index de4cc62..b39f69b 100644 --- a/src/api/house/houseInfo/model/index.ts +++ b/src/api/house/houseInfo/model/index.ts @@ -8,6 +8,8 @@ export interface HouseInfo { houseId?: number; // 房源标题 houseTitle?: string; + // 房源类型 + type?: number; // 房产所在的城市 cityByHouse?: string; // 户型 diff --git a/src/layout/index.vue b/src/layout/index.vue index 68c7ae2..59827d2 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -310,6 +310,12 @@ } } + // 顶栏菜单标题中样式调整 + .ele-admin-header-nav{ + display: flex; + justify-content: center; + } + // 顶栏菜单标题中样式调整 .ele-admin-header-nav > .ant-menu { & > .ant-menu-item, diff --git a/src/store/modules/theme.ts b/src/store/modules/theme.ts index 687bfbc..2087cc4 100644 --- a/src/store/modules/theme.ts +++ b/src/store/modules/theme.ts @@ -49,7 +49,7 @@ const DEFAULT_STATE: ThemeState = Object.freeze({ // 侧栏风格: light(亮色), dark(暗色) sideStyle: 'light', // 布局风格: side(默认), top(顶栏导航), mix(混合导航) - layoutStyle: 'side', + layoutStyle: 'mix', // 侧栏菜单风格: default(默认), mix(双排侧栏) sideMenuStyle: 'default', // 页签风格: default(默认), dot(圆点), card(卡片) diff --git a/src/views/house/houseInfo/components/houseInfoEdit.vue b/src/views/house/houseInfo/components/houseInfoEdit.vue index 02b6a90..62415bf 100644 --- a/src/views/house/houseInfo/components/houseInfoEdit.vue +++ b/src/views/house/houseInfo/components/houseInfoEdit.vue @@ -322,6 +322,8 @@ visible: boolean; // 修改回显的数据 data?: HouseInfo | null; + // 类型 + type?: null; }>(); const emit = defineEmits<{ diff --git a/src/views/house/houseInfo/index.vue b/src/views/house/houseInfo/index.vue index e430b82..c18be02 100644 --- a/src/views/house/houseInfo/index.vue +++ b/src/views/house/houseInfo/index.vue @@ -4,7 +4,7 @@ diff --git a/src/views/oa/oaAssetsSsl/components/oaAssetsSslEdit.vue b/src/views/oa/oaAssetsSsl/components/oaAssetsSslEdit.vue index 687e844..44218b3 100644 --- a/src/views/oa/oaAssetsSsl/components/oaAssetsSslEdit.vue +++ b/src/views/oa/oaAssetsSsl/components/oaAssetsSslEdit.vue @@ -30,7 +30,7 @@ diff --git a/src/views/pwl/pwlProjectLibrary/components/pwlProjectLibraryEdit.vue b/src/views/pwl/pwlProjectLibrary/components/pwlProjectLibraryEdit.vue index 2b06c97..1a65226 100644 --- a/src/views/pwl/pwlProjectLibrary/components/pwlProjectLibraryEdit.vue +++ b/src/views/pwl/pwlProjectLibrary/components/pwlProjectLibraryEdit.vue @@ -167,7 +167,6 @@ image: undefined, content: undefined, files: undefined, - comments: undefined, recommend: undefined, status: undefined, deleted: undefined, @@ -175,11 +174,7 @@ tenantId: undefined, createTime: undefined, updateTime: undefined, - pwlProjectLibraryId: undefined, - pwlProjectLibraryName: '', - status: 0, - comments: '', - sortNumber: 100 + comments: '' }); /* 更新visible */ diff --git a/src/views/pwl/pwlProjectLibrary/index.vue b/src/views/pwl/pwlProjectLibrary/index.vue index 2020377..2db0348 100644 --- a/src/views/pwl/pwlProjectLibrary/index.vue +++ b/src/views/pwl/pwlProjectLibrary/index.vue @@ -4,7 +4,7 @@ { const hide = message.loading('请求中..', 0); - removePwlProjectLibrary(row.pwlProjectLibraryId) + removePwlProjectLibrary(row.id) .then((msg) => { hide(); message.success(msg); @@ -249,7 +249,7 @@ maskClosable: true, onOk: () => { const hide = message.loading('请求中..', 0); - removeBatchPwlProjectLibrary(selection.value.map((d) => d.pwlProjectLibraryId)) + removeBatchPwlProjectLibrary(selection.value.map((d) => d.id)) .then((msg) => { hide(); message.success(msg); diff --git a/src/views/shop/shopAdmin/components/user-import.vue b/src/views/shop/shopAdmin/components/user-import.vue index 2274410..7431d6f 100644 --- a/src/views/shop/shopAdmin/components/user-import.vue +++ b/src/views/shop/shopAdmin/components/user-import.vue @@ -23,7 +23,7 @@