diff --git a/favicon.ico b/favicon.ico index ee520ce..4244f26 100644 Binary files a/favicon.ico and b/favicon.ico differ diff --git a/favicon2.ico b/favicon2.ico new file mode 100644 index 0000000..ee520ce Binary files /dev/null and b/favicon2.ico differ diff --git a/src/assets/logo.png b/src/assets/logo.png index b497ee0..4244f26 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/assets/logo2.png b/src/assets/logo2.png new file mode 100644 index 0000000..b497ee0 Binary files /dev/null and b/src/assets/logo2.png differ diff --git a/src/core/config.js b/src/core/config.js index af6428f..40f4f69 100644 --- a/src/core/config.js +++ b/src/core/config.js @@ -3,8 +3,8 @@ */ const config = { - appName: 'Gin-Vue-Admin', - appLogo: 'https://www.gin-vue-admin.com/img/logo.png', + appName: '嚯奖学吧', + appLogo: 'src/assets/logo.png', showViteLogo: true } diff --git a/src/style/basics.scss b/src/style/basics.scss index 2d859a3..206d9d6 100644 --- a/src/style/basics.scss +++ b/src/style/basics.scss @@ -16,7 +16,7 @@ $icon-arrow-size-aside:12px; $width-submenu-aside:55px; $height-aside-tilte:60px; $height-aside-img:30px; -$width-aside-img:30px; +$width-aside-img:50px; // header $height-header: 60px; // nav-scroll @@ -33,4 +33,4 @@ $color-table-thead:#262626; $height-car:68px; // mobile $padding-xs: 5px; -$margin-xs: 5px; \ No newline at end of file +$margin-xs: 5px; diff --git a/src/style/main.scss b/src/style/main.scss index 9282bef..1e29ea5 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -565,7 +565,7 @@ li { justify-content: center; .logoimg { width: $width-aside-img; - height: $height-aside-img; + //height: $height-aside-img; background: #fff; border-radius: 50%; padding: 3px; @@ -1223,4 +1223,4 @@ $mainHight: 100vh; .justify-content-flex-end { justify-content: flex-end; -} \ No newline at end of file +} diff --git a/src/view/course/addCourse/index.vue b/src/view/course/addCourse/index.vue index 9b18d64..11d698c 100644 --- a/src/view/course/addCourse/index.vue +++ b/src/view/course/addCourse/index.vue @@ -44,7 +44,7 @@ async function getCourseInfo() { // 获取课程信息 const res = await api.getCourse({id:course_id.value}) if(res.code === 0) { chapter_info.value = res.data.course_ware_json - form.value = res.data + form.value = res.data.course console.log(form.value) } } @@ -203,7 +203,7 @@ function onSubmit() { - + diff --git a/src/view/course/courseCategory/index.vue b/src/view/course/courseCategory/index.vue index e874350..bde5337 100644 --- a/src/view/course/courseCategory/index.vue +++ b/src/view/course/courseCategory/index.vue @@ -8,7 +8,7 @@ import {ref,onMounted } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' // 变量 const queryParams = ref({ - pageIndex:1, + page:1, pageSize:10, keyword:'' }) diff --git a/src/view/course/index.vue b/src/view/course/index.vue index daa4a1f..4d8b2a2 100644 --- a/src/view/course/index.vue +++ b/src/view/course/index.vue @@ -11,7 +11,7 @@ const router = useRouter() const route = useRoute() // 变量 const queryParams = ref({ - pageIndex:1, + page:1, pageSize:10, name:'', status:'', diff --git a/src/view/course/viewCourse/index.vue b/src/view/course/viewCourse/index.vue index ca0d8b3..249307b 100644 --- a/src/view/course/viewCourse/index.vue +++ b/src/view/course/viewCourse/index.vue @@ -9,6 +9,7 @@ const route = useRoute() // 变量 const course_id = ref(0) const courseData = ref({}) +const baseInfo = ref({}) // 生命周期 onMounted(() => { course_id.value = route.params.course_id @@ -19,10 +20,12 @@ async function getCourse() { // 获取课程信息 const res = await api.getCourse({id:course_id.value}) if(res.code === 0) { courseData.value = res.data + baseInfo.value = res.data.course + // console.log(res.data.course) } } function downloadChapterChildFunc(item) { // 点击下载 - console.log(item) + // console.log(item) window.open(row.url) } @@ -38,19 +41,19 @@ function downloadChapterChildFunc(item) { // 点击下载
课程名称:
-
{{courseData.name}}
+
{{baseInfo.name}}
课程科目:
-
{{courseData.subject}}
+
{{baseInfo.subject}}
课程状态:
-
{{courseData.status === 1?'上架':'下架'}}
+
{{baseInfo.status === 1?'上架':'下架'}}
课程价格:
-
{{courseData.price}}
+
{{baseInfo.price}}
教师姓名:
@@ -58,11 +61,11 @@ function downloadChapterChildFunc(item) { // 点击下载
创建时间:
-
{{courseData.CreatedAt}}
+
{{baseInfo.CreatedAt}}
课程简介:
-
{{courseData.introduction}}
+
{{baseInfo.intro}}
diff --git a/src/view/lbtManage/index.vue b/src/view/lbtManage/index.vue index caa38a7..a776c7f 100644 --- a/src/view/lbtManage/index.vue +++ b/src/view/lbtManage/index.vue @@ -259,7 +259,7 @@ function handleSizeChange(val) {
- +