diff --git a/vueHomilyLink/package-lock.json b/vueHomilyLink/package-lock.json index df9ca7e..1412f88 100644 --- a/vueHomilyLink/package-lock.json +++ b/vueHomilyLink/package-lock.json @@ -1436,23 +1436,6 @@ "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==", "license": "MIT" }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "license": "MIT" - }, - "node_modules/axios": { - "version": "1.7.8", - "resolved": "https://registry.npmmirror.com/axios/-/axios-1.7.8.tgz", - "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==", - "license": "MIT", - "dependencies": { - "follow-redirects": "^1.15.6", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "node_modules/birpc": { "version": "0.2.19", "resolved": "https://registry.npmmirror.com/birpc/-/birpc-0.2.19.tgz", @@ -1533,6 +1516,18 @@ ], "license": "CC-BY-4.0" }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-2.0.0.tgz", @@ -1638,6 +1633,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/electron-to-chromium": { "version": "1.5.64", "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.64.tgz", @@ -1746,6 +1750,40 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.1", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fs-extra": { "version": "11.2.0", "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-11.2.0.tgz", @@ -2009,6 +2047,27 @@ "dev": true, "license": "MIT" }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/mimic-fn": { "version": "4.0.0", "resolved": "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-4.0.0.tgz", @@ -2258,6 +2317,12 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, "node_modules/rfdc": { "version": "1.4.1", "resolved": "https://registry.npmmirror.com/rfdc/-/rfdc-1.4.1.tgz", diff --git a/vueHomilyLink/src/api/HomeApi.js b/vueHomilyLink/src/api/HomeApi.js new file mode 100644 index 0000000..21e603a --- /dev/null +++ b/vueHomilyLink/src/api/HomeApi.js @@ -0,0 +1,12 @@ +import service from "."; +const homeApi = { + //获取首页列表 + gethomeList() { + return service.get('/mainpage/get-shows'); + }, + //获取视频列表 + getHomeVideo(){ + return service.get('/mainpage/get-videos?flagType=1'); + } +} +export default homeApi; \ No newline at end of file diff --git a/vueHomilyLink/src/api/index.js b/vueHomilyLink/src/api/index.js index e8e7453..a6ba51f 100644 --- a/vueHomilyLink/src/api/index.js +++ b/vueHomilyLink/src/api/index.js @@ -1,8 +1,9 @@ import axios from "axios"; const service = axios.create({ - // baseURL: 'http://192.168.9.19:8080', - baseURL: '/api' + // baseURL: 'http://192.168.8.191:8080', + // baseURL: 'http://localhost:8080', + baseURL: '/api', }); // http://192.168.8.191:8080 diff --git a/vueHomilyLink/src/assets/main.css b/vueHomilyLink/src/assets/main.css index ebb7529..7294622 100644 --- a/vueHomilyLink/src/assets/main.css +++ b/vueHomilyLink/src/assets/main.css @@ -1,3 +1,6 @@ +@import './base.css'; + + html,body{ margin:0px; height: 100%; diff --git a/vueHomilyLink/src/components/Nav.vue b/vueHomilyLink/src/components/Nav.vue index 5761d58..39fb6ae 100644 --- a/vueHomilyLink/src/components/Nav.vue +++ b/vueHomilyLink/src/components/Nav.vue @@ -5,9 +5,10 @@ @@ -17,14 +18,16 @@ background-color: rgba(177, 174, 159, 0.493); height: 30px; border-bottom: 1px solid #aaa; - width: 100%; + width: 1000px; + margin-right: auto; + margin-left: auto; } .container{ width: 1200px; - a{ +} +a{ margin-right: 40px; margin-left: 50px; color: black; } -} \ No newline at end of file diff --git a/vueHomilyLink/src/views/HomeView.vue b/vueHomilyLink/src/views/HomeView.vue index a19f8f5..89a0c11 100644 --- a/vueHomilyLink/src/views/HomeView.vue +++ b/vueHomilyLink/src/views/HomeView.vue @@ -1,12 +1,365 @@ + diff --git a/vueHomilyLink/vite.config.js b/vueHomilyLink/vite.config.js index a44a510..f087d82 100644 --- a/vueHomilyLink/vite.config.js +++ b/vueHomilyLink/vite.config.js @@ -18,7 +18,8 @@ export default defineConfig({ server: { proxy: { '/api': { - target: 'http://192.168.9.19:8080', + target: 'http://192.168.8.191:8080', + // target: 'http://localhost:8080', changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '') }