diff --git a/package.json b/package.json index 731fd90..6dd4eb0 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "build": "vite build" }, "dependencies": { - "element-plus": "^2.2.26", + "element-plus": "^2.2.27", "vite-plugin-require-transform": "^1.0.4", "vue": "^3.2.45", "vue-router": "^4.1.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5452a92..f5fa7f5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,7 +4,7 @@ specifiers: '@vitejs/plugin-vue': ^2.3.3 '@vitejs/plugin-vue-jsx': ^1.3.10 black-knight: 1.3.25 - element-plus: ^2.2.26 + element-plus: ^2.2.27 less: ^4.1.3 less-loader: ~7.3.0 sass-resources-loader: ^2.2.5 @@ -16,7 +16,7 @@ specifiers: vuex: ^4.1.0 dependencies: - element-plus: 2.2.26_vue@3.2.45 + element-plus: 2.2.27_vue@3.2.45 vite-plugin-require-transform: 1.0.4 vue: 3.2.45 vue-router: 4.1.6_vue@3.2.45 @@ -887,8 +887,8 @@ packages: resolution: {integrity: sha512-uxMa/Dt7PQsLBVXwH+t6JvpHJnrsYBaxWKi/J6HE+/nBtoHENhwBoNkgkm226/Kfxeg0z1eMQLBRPPKcDH8xWA==} dev: true - /element-plus/2.2.26_vue@3.2.45: - resolution: {integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==} + /element-plus/2.2.27_vue@3.2.45: + resolution: {integrity: sha512-P04HDOZBYDdvlYuleuCZRULzAc5xJVOBfLDK9xWxVo0vyo8ntdaXS5sTU+/76vrNzuO3FhLn9kvrsbiJEVa1jg==} peerDependencies: vue: ^3.2.0 dependencies: diff --git a/src/assets/img/home/content_title_icon.png b/src/assets/img/home/content_title_icon.png new file mode 100644 index 0000000..947c002 Binary files /dev/null and b/src/assets/img/home/content_title_icon.png differ diff --git a/src/assets/img/home/head_bg.png b/src/assets/img/home/head_bg.png new file mode 100644 index 0000000..e6c5ec7 Binary files /dev/null and b/src/assets/img/home/head_bg.png differ diff --git a/src/assets/img/home/head_title_icon.png b/src/assets/img/home/head_title_icon.png new file mode 100644 index 0000000..0fec4b6 Binary files /dev/null and b/src/assets/img/home/head_title_icon.png differ diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png deleted file mode 100644 index f3d2503..0000000 Binary files a/src/assets/img/logo.png and /dev/null differ diff --git a/src/assets/svg/set.svg b/src/assets/svg/set.svg deleted file mode 100644 index ab2c220..0000000 --- a/src/assets/svg/set.svg +++ /dev/null @@ -1,2 +0,0 @@ - \ No newline at end of file diff --git a/src/components/container_web.vue b/src/components/container_web.vue new file mode 100644 index 0000000..f1126b8 --- /dev/null +++ b/src/components/container_web.vue @@ -0,0 +1,53 @@ + + + diff --git a/src/components/dvLoading.vue b/src/components/dvLoading.vue new file mode 100644 index 0000000..dad1a3f --- /dev/null +++ b/src/components/dvLoading.vue @@ -0,0 +1,75 @@ + + + + \ No newline at end of file diff --git a/src/components/index.js b/src/components/index.js index ae589b0..26a99ce 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,7 +1,11 @@ import svgIcon from './svg-icon.vue' +import containerWeb from './container_web.vue' +import dvLoading from './dvLoading.vue' const components={ svgIcon, + containerWeb, + dvLoading, } export default{ diff --git a/src/main.js b/src/main.js index a3b6805..dd5e4f6 100644 --- a/src/main.js +++ b/src/main.js @@ -6,9 +6,8 @@ import regComponents from '@/components' import {defineObj} from 'black-knight/lib/config/custom' import {provise} from 'black-knight/lib/config/tools' import ElementPlus from 'element-plus' +import zhCn from 'element-plus/dist/locale/zh-cn.mjs' import "element-plus/dist/index.css" -console.log(import.meta.env,'--------------import------') -console.log(defineObj,'----defineObj---') import "@/assets/style/index.less" import vue3VideoPlay from 'vue3-video-play' @@ -18,9 +17,7 @@ var app=createApp(App) app.use(router) .use(store) .use(regComponents) - .use(ElementPlus) + .use(ElementPlus,{locale:zhCn}) .use(vue3VideoPlay) .provide('event',new provise()) - .mount('#app') - -app.config.globalProperties.foo='===foo====' // 全局配置属性 \ No newline at end of file + .mount('#app') \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index ab2689e..ce91abd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,7 +6,9 @@ export const menu = [ { path:"/", component:()=>import("@/views/home.vue"), - children:[] + children:[ + {path:"/info", component:()=>import("@/views/info.vue")} + ] }, ]; const router = createRouter({ diff --git a/src/store/modules/data.js b/src/store/modules/data.js index e92618b..8e72de0 100644 --- a/src/store/modules/data.js +++ b/src/store/modules/data.js @@ -1,16 +1,25 @@ +var loadNum = 0 export default { namespaced:true, state:{ - menu:{}, + loading:false, }, getters:{ - menuName:state=>Object.values(state.menu).map(v=>v.name) + loading: state=>state.loading, }, mutations:{ - setMenu(state, val){ - state.menu[val.key]=val.item - } + setLoading(){ + if(val){ + loadNum++; + state.loading = true + } else { + --loadNum; + if(loadNum<=0){ + state.loading = false + } + } + }, }, actions:{ diff --git a/src/views/home.vue b/src/views/home.vue index 2400f9d..d2804d7 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -1,8 +1,107 @@ \ No newline at end of file