From 46829c020638e7654f7ba202ce93ac981165106b Mon Sep 17 00:00:00 2001 From: lenghui Date: Wed, 4 Dec 2024 14:28:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vueHomilyLink/package-lock.json | 91 +++++++++++++++++++++++ vueHomilyLink/package.json | 1 + vueHomilyLink/src/api/LiveApi.js | 13 ++-- vueHomilyLink/src/api/index.js | 3 +- vueHomilyLink/src/views/LiveView.vue | 138 +++++++++-------------------------- vueHomilyLink/vite.config.js | 9 +++ 6 files changed, 146 insertions(+), 109 deletions(-) diff --git a/vueHomilyLink/package-lock.json b/vueHomilyLink/package-lock.json index a347183..8cee371 100644 --- a/vueHomilyLink/package-lock.json +++ b/vueHomilyLink/package-lock.json @@ -8,6 +8,7 @@ "name": "vuehomilylink", "version": "0.0.0", "dependencies": { + "axios": "^1.7.8", "pinia": "^2.2.6", "vue": "^3.5.12", "vue-router": "^4.4.5" @@ -1434,6 +1435,21 @@ "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==" + }, + "node_modules/axios": { + "version": "1.7.8", + "resolved": "https://registry.npmmirror.com/axios/-/axios-1.7.8.tgz", + "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==", + "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", @@ -1514,6 +1530,17 @@ ], "license": "CC-BY-4.0" }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "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", @@ -1619,6 +1646,14 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "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", @@ -1727,6 +1762,38 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.1", + "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", + "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", @@ -1990,6 +2057,25 @@ "dev": true, "license": "MIT" }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "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", @@ -2239,6 +2325,11 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/rfdc": { "version": "1.4.1", "resolved": "https://registry.npmmirror.com/rfdc/-/rfdc-1.4.1.tgz", diff --git a/vueHomilyLink/package.json b/vueHomilyLink/package.json index 5c51bad..79fd816 100644 --- a/vueHomilyLink/package.json +++ b/vueHomilyLink/package.json @@ -9,6 +9,7 @@ "preview": "vite preview" }, "dependencies": { + "axios": "^1.7.8", "pinia": "^2.2.6", "vue": "^3.5.12", "vue-router": "^4.4.5" diff --git a/vueHomilyLink/src/api/LiveApi.js b/vueHomilyLink/src/api/LiveApi.js index 5e6733d..5ea3ab7 100644 --- a/vueHomilyLink/src/api/LiveApi.js +++ b/vueHomilyLink/src/api/LiveApi.js @@ -2,14 +2,15 @@ import service from "."; const liveApi = { //获取直播列表 getLiveList() { - return service.get('/live'); + return service.post('/live', { UserId: 90000001 }); }, //预约 - addReservation(id,userId){ - return service.post('/reservation',{id,userId}); + addReservation(Id, UserId) { + return service.post('/reservation', { Id, UserId }); }, //取消预约 - cancelReservation(id,userId){ - return service.delete('/reservation',{id,userId}); + cancelReservation(Id, UserId) { + return service.delete(`/reservation?Id=${Id}&UserId=${UserId}`); } -} \ No newline at end of file +} +export default liveApi; \ No newline at end of file diff --git a/vueHomilyLink/src/api/index.js b/vueHomilyLink/src/api/index.js index a388e65..f4a660c 100644 --- a/vueHomilyLink/src/api/index.js +++ b/vueHomilyLink/src/api/index.js @@ -1,7 +1,8 @@ import axios from "axios"; const service = axios.create({ - baseURL: 'http://localhost:8080', + // baseURL: 'http://192.168.9.19:8080', + baseURL: '/api' }); diff --git a/vueHomilyLink/src/views/LiveView.vue b/vueHomilyLink/src/views/LiveView.vue index 9c042cb..d62590e 100644 --- a/vueHomilyLink/src/views/LiveView.vue +++ b/vueHomilyLink/src/views/LiveView.vue @@ -13,11 +13,11 @@ 节目1 -
{{ live.user.userName }}
+
{{ live.user.username }}
预约 - 已预约 + @click="booking(live.id, 90000001)">预约 + 已预约 @@ -26,82 +26,23 @@ @@ -226,7 +160,7 @@ function booking(liveId, userId) { position: absolute; top: 0; left: 0; - width: 207px; + width: 209px; height: 120px; /*最后一个参数是半透明度，可以透过调整0-1的数值，调整到满意的透明度*/ background-color: rgba(0, 0, 0, 0.3); diff --git a/vueHomilyLink/vite.config.js b/vueHomilyLink/vite.config.js index 4217010..26696aa 100644 --- a/vueHomilyLink/vite.config.js +++ b/vueHomilyLink/vite.config.js @@ -15,4 +15,13 @@ export default defineConfig({ '@': fileURLToPath(new URL('./src', import.meta.url)) }, }, + server: { + proxy: { + '/api': { + target: 'http://192.168.9.19:8080', + changeOrigin: true, + rewrite: (path) => path.replace(/^\/api/, '') + } + } + }, })