diff --git a/src/api/index.js b/src/api/index.js deleted file mode 100644 index 6dc7a81..0000000 --- a/src/api/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import videos from './videos' -import user from './user' - -export default { - videos, - // user, -} diff --git a/src/api/user.js b/src/api/user.js index 556837c..d89dff6 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -1,14 +1,5 @@ import request from "../utils/request"; -export default { - friends(params, data) { - return request({url: '/user/friends', method: 'get', params, data}) - }, - author(params, data) { - return request({url: '/user/author', method: 'get', params, data}) - }, -} - export function userinfo(params, data) { return request({url: '/user/userinfo', method: 'get', params, data}) } diff --git a/src/api/videos.js b/src/api/videos.js index f97410f..e712022 100644 --- a/src/api/videos.js +++ b/src/api/videos.js @@ -1,15 +1,15 @@ import request from "../utils/request"; -export default { - recommended(params, data) { - return request({url: '/video/recommended', method: 'get', params, data}) - }, - historyVideo(params, data) { - return request({url: '/video/historyVideo', method: 'get', params, data}) - }, - historyOther(params, data) { - return request({url: '/video/historyOther', method: 'get', params, data}) - }, +export function historyOther(params, data) { + return request({url: '/video/historyOther', method: 'get', params, data}) +} + +export function historyVideo(params, data) { + return request({url: '/video/history', method: 'get', params, data}) +} + +export function recommendedVideo(params, data) { + return request({url: '/video/recommended', method: 'get', params, data}) } export function myVideo(params, data) { diff --git a/src/main.js b/src/main.js index 93d8445..5a0ba43 100644 --- a/src/main.js +++ b/src/main.js @@ -3,7 +3,6 @@ import App from './App.vue' import mitt from 'mitt' import './assets/less/index.less' import {startMock} from './mock' -import api from './api' import router from "./router"; import store from "./store"; import mixin from "./utils/mixin"; @@ -17,7 +16,6 @@ const pinia = createPinia() const emitter = mitt() const app = Vue.createApp(App) -app.config.globalProperties.$api = {...api} app.config.globalProperties.emitter = emitter app.config.unwrapInjectedRef = true app.provide('mitt', emitter) diff --git a/src/mock/index.js b/src/mock/index.js index 99a25fd..cbd71f2 100644 --- a/src/mock/index.js +++ b/src/mock/index.js @@ -171,7 +171,7 @@ export async function startMock() { return [200, {data: v, code: 200}] }) - mock.onGet(/historyVideo/).reply(async (config) => { + mock.onGet(/video\/history/).reply(async (config) => { let page = getPage2(config.params) return [200, { data: { diff --git a/src/pages/home/Attention.vue b/src/pages/home/Attention.vue index 5b149f0..df13bc6 100644 --- a/src/pages/home/Attention.vue +++ b/src/pages/home/Attention.vue @@ -124,8 +124,6 @@ import {onMounted, reactive} from "vue"; import {useNav} from "@/utils/hooks/useNav"; -import api from "@/api"; -import SlideList from "@/pages/home/slide/SlideList.vue"; import Utils, {$no} from "@/utils"; import Scroll from "@/components/Scroll.vue"; import goods from "@/assets/data/goods"; diff --git a/src/pages/home/slide/LongVideo.vue b/src/pages/home/slide/LongVideo.vue index 70e1cee..2bbfb76 100644 --- a/src/pages/home/slide/LongVideo.vue +++ b/src/pages/home/slide/LongVideo.vue @@ -2,9 +2,9 @@ import {computed, onMounted, onUnmounted, reactive, ref, watch} from "vue"; import {uniqueId} from "lodash-es"; -import api from "@/api"; import {useStore} from "vuex"; import {_checkImgUrl, _duration, _formatNumber} from "@/utils"; +import {recommendedVideo} from "@/api/videos"; const store = useStore() const loading = computed(() => store.state.loading) @@ -39,7 +39,7 @@ function loadMore() { async function getData(refresh = false) { if (loading.value) return store.commit('setLoading', true) - let res = await api.videos.recommended({pageNo: refresh ? 0 : state.pageNo, pageSize: state.pageSize}) + let res = await recommendedVideo({pageNo: refresh ? 0 : state.pageNo, pageSize: state.pageSize}) console.log('getSlide4Data-', 'refresh', refresh, res) store.commit('setLoading', false) if (res.code === 200) { diff --git a/src/pages/home/slide/Slide0.vue b/src/pages/home/slide/Slide0.vue index 02db273..d2291f0 100644 --- a/src/pages/home/slide/Slide0.vue +++ b/src/pages/home/slide/Slide0.vue @@ -47,7 +47,7 @@ @@ -58,8 +58,8 @@ import SlideItem from '@/components/slide/SlideItem.vue' import {onMounted, onUnmounted, reactive, ref} from "vue"; import bus, {EVENT_KEY} from "@/utils/bus"; import Utils from "@/utils"; -import api from "@/api"; import SlideList from './SlideList.vue'; +import {recommendedVideo} from "@/api/videos"; const props = defineProps({ cbs: { diff --git a/src/pages/home/slide/Slide2.vue b/src/pages/home/slide/Slide2.vue index f6e1334..a1f438a 100644 --- a/src/pages/home/slide/Slide2.vue +++ b/src/pages/home/slide/Slide2.vue @@ -17,7 +17,7 @@ @@ -28,8 +28,8 @@ import SlideItem from '@/components/slide/SlideItem.vue' import {onMounted, onUnmounted, reactive, ref} from "vue"; import bus, {EVENT_KEY} from "@/utils/bus"; import Utils from "@/utils"; -import api from "@/api"; import SlideList from './SlideList.vue'; +import {recommendedVideo} from "@/api/videos"; const props = defineProps({ active: { diff --git a/src/pages/home/slide/Slide4.vue b/src/pages/home/slide/Slide4.vue index 3451b8e..7396b12 100644 --- a/src/pages/home/slide/Slide4.vue +++ b/src/pages/home/slide/Slide4.vue @@ -3,15 +3,15 @@