diff --git a/src/api/tea_store.ts b/src/api/tea_store.ts index f5f2e82..6a3f923 100644 --- a/src/api/tea_store.ts +++ b/src/api/tea_store.ts @@ -23,4 +23,14 @@ export function apiTeaStoreDelete(params: any) { // 门店表详情 export function apiTeaStoreDetail(params: any) { return request.get({ url: '/tea_store/detail', params }) +} + +// 门店城市列表 +export function apiTeaStoreCityLists() { + return request.get({ url: '/teaStore/teaStoreCity' }) +} + +// 归属人 +export function apiTeaStoreOwnerLists(params: any) { + return request.get({ url: '/teaStore/storeUser', params }) } \ No newline at end of file diff --git a/src/utils/util.ts b/src/utils/util.ts index 8039c34..b472f8c 100644 --- a/src/utils/util.ts +++ b/src/utils/util.ts @@ -185,9 +185,9 @@ export const calcColor = (color: string, opacity: number): string => { const fullHex = hex.length === 3 ? hex - .split('') - .map((h) => h + h) - .join('') + .split('') + .map((h) => h + h) + .join('') : hex // 转换为 RGB @@ -217,3 +217,29 @@ export const calcColor = (color: string, opacity: number): string => { // 返回转换后的 rgba 颜色值 return `rgba(${r}, ${g}, ${b}, ${opacity})` } + +const OSS_PREFIX = 'https://chaz.oss-cn-shanghai.aliyuncs.com/' + + +export const removeImageUrlPrefix = (file: any) => { + if (Array.isArray(file)) { + const fileList = file.map((item) => { + return item.replace(OSS_PREFIX, '') + }) + return fileList + } else { + return file.replace(OSS_PREFIX, '') + } +} + +export const normalizeImageUrl = (file: any) => { + if (Array.isArray(file)) { + const fileList = file.map((item) => { + return OSS_PREFIX + item + }) + console.log("🚀 ~ normalizeImageUrl ~ fileList:", fileList) + return fileList + } else { + return OSS_PREFIX + file + } +} \ No newline at end of file diff --git a/src/views/article/lists/edit.vue b/src/views/article/lists/edit.vue index 1dff792..e912d65 100644 --- a/src/views/article/lists/edit.vue +++ b/src/views/article/lists/edit.vue @@ -4,66 +4,31 @@ - +
- +
- +
- - + +
- +
- +
diff --git a/src/views/tea_store/edit.vue b/src/views/tea_store/edit.vue index 4ff3a8c..5d991d3 100644 --- a/src/views/tea_store/edit.vue +++ b/src/views/tea_store/edit.vue @@ -1,25 +1,25 @@ - - + - + - + @@ -90,6 +106,7 @@ import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' import { useDictOptions } from '@/hooks/useDictOptions' +import { getRoutePath } from '@/router' const editRef = shallowRef>() // 是否显示编辑框 diff --git a/src/views/teamaster_user/edit.vue b/src/views/teamaster_user/edit.vue index 2990e55..7e5023e 100644 --- a/src/views/teamaster_user/edit.vue +++ b/src/views/teamaster_user/edit.vue @@ -1,21 +1,10 @@ - diff --git a/vite.config.ts b/vite.config.ts index 6a7af99..db2d7f5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -40,6 +40,7 @@ export default defineConfig({ base: '/admin/', server: { host: '0.0.0.0', + port: 5174, // 修改端口号，如有需要可调整 hmr: true, open: true, proxy: {