diff --git a/main/src/micro/app.js b/main/src/micro/app.js index beee6ed..9eb68b3 100644 --- a/main/src/micro/app.js +++ b/main/src/micro/app.js @@ -58,7 +58,7 @@ export const rightApps = [ { name: 'sub-government-screen-service', entry: VITE_APP_SUB_GSS, - activeRule: '/sub-government-screen-service/', + activeRule: '/sub-government-screen-service', title: '数据大屏', icon: 'images/platform/icon-screen.png', }, @@ -75,10 +75,17 @@ export const defaultApps = [ { name: 'sub-government-screen-service', entry: VITE_APP_SUB_GSS, - activeRule: '/sub-government-screen-service/', + activeRule: '/sub-government-screen-service', title: '数据大屏', icon: 'images/platform/icon-screen.png', }, + { + name: 'sub-operation-service', + entry: VITE_APP_SUB_OS, + activeRule: '/sub-operation-service', + title: '运营服务', + icon: 'images/platform/icon-home.png', + }, ]; // export const microApps = [...defaultApps, ...leftApps, ...rightApps]; diff --git a/sub-government-screen-service/src/components/baseBg.vue b/sub-government-screen-service/src/components/baseBg.vue index bad9c6e..afb1d04 100644 --- a/sub-government-screen-service/src/components/baseBg.vue +++ b/sub-government-screen-service/src/components/baseBg.vue @@ -1,5 +1,6 @@ diff --git a/sub-government-screen-service/src/layouts/component/Bottom/index.vue b/sub-government-screen-service/src/layouts/component/Bottom/index.vue new file mode 100644 index 0000000..17f2904 --- /dev/null +++ b/sub-government-screen-service/src/layouts/component/Bottom/index.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/sub-government-screen-service/src/layouts/component/Main/index.vue b/sub-government-screen-service/src/layouts/component/Main/index.vue index 09c10b8..67a9729 100644 --- a/sub-government-screen-service/src/layouts/component/Main/index.vue +++ b/sub-government-screen-service/src/layouts/component/Main/index.vue @@ -31,18 +31,5 @@ const isReload = computed(() => SettingStore.isReload); diff --git a/sub-government-screen-service/src/layouts/index.vue b/sub-government-screen-service/src/layouts/index.vue index 05eea89..853954d 100644 --- a/sub-government-screen-service/src/layouts/index.vue +++ b/sub-government-screen-service/src/layouts/index.vue @@ -6,34 +6,36 @@ * @LastEditTime: 2024-02-05 16:03:31 --> diff --git a/sub-operation-service/src/assets/images/ecommerce/banner.png b/sub-operation-service/src/assets/images/ecommerce/banner.png new file mode 100644 index 0000000..6ad5f50 Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/banner.png differ diff --git a/sub-operation-service/src/assets/images/ecommerce/banner1.png b/sub-operation-service/src/assets/images/ecommerce/banner1.png new file mode 100644 index 0000000..d4ae74a Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/banner1.png differ diff --git a/sub-operation-service/src/assets/images/ecommerce/menu1.png b/sub-operation-service/src/assets/images/ecommerce/menu1.png new file mode 100644 index 0000000..27ac5b2 Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/menu1.png differ diff --git a/sub-operation-service/src/assets/images/ecommerce/menu2.png b/sub-operation-service/src/assets/images/ecommerce/menu2.png new file mode 100644 index 0000000..c8fe75d Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/menu2.png differ diff --git a/sub-operation-service/src/assets/images/ecommerce/menu3.png b/sub-operation-service/src/assets/images/ecommerce/menu3.png new file mode 100644 index 0000000..a14e4f8 Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/menu3.png differ diff --git a/sub-operation-service/src/assets/images/ecommerce/menu4.png b/sub-operation-service/src/assets/images/ecommerce/menu4.png new file mode 100644 index 0000000..5904a55 Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/menu4.png differ diff --git a/sub-operation-service/src/assets/images/ecommerce/pic.png b/sub-operation-service/src/assets/images/ecommerce/pic.png new file mode 100644 index 0000000..0bc474e Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/pic.png differ diff --git a/sub-operation-service/src/assets/images/logo.png b/sub-operation-service/src/assets/images/logo.png new file mode 100644 index 0000000..3d7da94 Binary files /dev/null and b/sub-operation-service/src/assets/images/logo.png differ diff --git a/sub-operation-service/src/config/index.js b/sub-operation-service/src/config/index.js index 0e4f584..06b98e0 100644 --- a/sub-operation-service/src/config/index.js +++ b/sub-operation-service/src/config/index.js @@ -1,7 +1,9 @@ -const { VITE_APP_NAME } = import.meta.env; +import { qiankunWindow } from 'vite-plugin-qiankun/dist/helper'; +const { VITE_APP_MIAN, VITE_APP_NAME } = import.meta.env; -export const GenKey = (key, prefix = `${VITE_APP_NAME}_`) => { - return prefix ? prefix + key : key; +export const GenKey = (key, prefix = VITE_APP_NAME) => { + prefix = qiankunWindow.__POWERED_BY_QIANKUN__ ? VITE_APP_MIAN : VITE_APP_MIAN; + return prefix ? `${prefix}_` + key : key; }; export const CONSTANTS = { diff --git a/sub-operation-service/src/layouts/component/Header/index.vue b/sub-operation-service/src/layouts/component/Header/index.vue index 0e8ca65..04fd894 100644 --- a/sub-operation-service/src/layouts/component/Header/index.vue +++ b/sub-operation-service/src/layouts/component/Header/index.vue @@ -1,44 +1,59 @@ @@ -49,9 +64,11 @@ import { useSettingStore } from '@/store/modules/setting'; import { usePermissionStore } from '@/store/modules/permission'; import { qrImg } from './base64img'; import AppLink from '../Menu/Link.vue'; -import { useRoute } from 'vue-router'; +import { useRoute, useRouter } from 'vue-router'; +import { isEmpty, getAssetsFile } from '@/utils'; const route = useRoute(); +const router = useRouter(); const SettingStore = useSettingStore(); const PermissionStore = usePermissionStore(); const cacheRoutes = computed(() => PermissionStore.keepAliveRoutes); @@ -75,6 +92,7 @@ const meuns = ref([ }, { label: '电商交易', + path: '/sub-operation-service/ecommerce', }, { label: '分拣包装', @@ -90,47 +108,105 @@ const meuns = ref([ function Search() { console.log(keyword.value, 'search'); } + +const toHome = () => { + console.info('toHome', router); + router.push('/'); +}; diff --git a/sub-operation-service/src/views/ecommerce/components/common.vue b/sub-operation-service/src/views/ecommerce/components/common.vue new file mode 100644 index 0000000..6385b0b --- /dev/null +++ b/sub-operation-service/src/views/ecommerce/components/common.vue @@ -0,0 +1,55 @@ + + + diff --git a/sub-operation-service/src/views/ecommerce/components/filtertop.vue b/sub-operation-service/src/views/ecommerce/components/filtertop.vue new file mode 100644 index 0000000..21e40d7 --- /dev/null +++ b/sub-operation-service/src/views/ecommerce/components/filtertop.vue @@ -0,0 +1,158 @@ + + + diff --git a/sub-operation-service/src/views/ecommerce/components/goodsItem.vue b/sub-operation-service/src/views/ecommerce/components/goodsItem.vue new file mode 100644 index 0000000..8f8028c --- /dev/null +++ b/sub-operation-service/src/views/ecommerce/components/goodsItem.vue @@ -0,0 +1,76 @@ + + + diff --git a/sub-operation-service/src/views/ecommerce/components/leftMenu.vue b/sub-operation-service/src/views/ecommerce/components/leftMenu.vue new file mode 100644 index 0000000..7bf98dd --- /dev/null +++ b/sub-operation-service/src/views/ecommerce/components/leftMenu.vue @@ -0,0 +1,84 @@ + + + diff --git a/sub-operation-service/src/views/ecommerce/index.vue b/sub-operation-service/src/views/ecommerce/index.vue new file mode 100644 index 0000000..16eb67d --- /dev/null +++ b/sub-operation-service/src/views/ecommerce/index.vue @@ -0,0 +1,85 @@ + + + diff --git a/sub-operation-service/src/views/ecommerce/land.vue b/sub-operation-service/src/views/ecommerce/land.vue new file mode 100644 index 0000000..22a2d80 --- /dev/null +++ b/sub-operation-service/src/views/ecommerce/land.vue @@ -0,0 +1,12 @@ + + diff --git a/sub-operation-service/src/views/ecommerce/purchaser.vue b/sub-operation-service/src/views/ecommerce/purchaser.vue new file mode 100644 index 0000000..4a60be0 --- /dev/null +++ b/sub-operation-service/src/views/ecommerce/purchaser.vue @@ -0,0 +1,156 @@ + + + diff --git a/sub-operation-service/src/views/ecommerce/supplier.vue b/sub-operation-service/src/views/ecommerce/supplier.vue new file mode 100644 index 0000000..3b440e1 --- /dev/null +++ b/sub-operation-service/src/views/ecommerce/supplier.vue @@ -0,0 +1,164 @@ + + + diff --git a/sub-operation-service/vite.config.js b/sub-operation-service/vite.config.js index d5b1e88..eecb528 100644 --- a/sub-operation-service/vite.config.js +++ b/sub-operation-service/vite.config.js @@ -25,7 +25,7 @@ const useDevMode = true; export default defineConfig(({ command, mode }) => { const { VITE_PORT, VITE_APP_NAME, VITE_APP_BASE_API, VITE_APP_BASE_URL, VITE_APP_UPLOAD_API, VITE_APP_UPLOAD_URL } = loadEnv(mode, process.cwd()); const config = { - base: './', + base: '/sub-operation-service/', build: { target: 'ESNext', outDir: 'dist',