From 99d7899bdcc85fc9ef9d7d43e84fab1017a58917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=B1=AA?= <781521347@qq.com>
Date: Sat, 19 Jun 2021 18:51:58 +0800
Subject: [PATCH] =?UTF-8?q?2021=E5=B9=B46=E6=9C=8819=E6=97=A518:51:54?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/knowledge.js | 20 +-
components/uni-countdown/uni-countdown.vue | 38 +-
pages.json | 18 -
pages/authorization/index.vue | 2 +-
pages/course/detail.vue | 460 +++++++++++++--------
pages/course/index.vue | 22 +-
pages/home/index.vue | 89 ++--
pages/shop/GoodsCon/index.vue | 2 +-
pages/user/User/index.vue | 4 +-
static/article1.png | Bin 0 -> 352705 bytes
static/home-banner.png | Bin 0 -> 343772 bytes
utils/request.js | 2 +-
12 files changed, 359 insertions(+), 298 deletions(-)
create mode 100644 static/article1.png
create mode 100644 static/home-banner.png
diff --git a/api/knowledge.js b/api/knowledge.js
index 933960c..909296c 100644
--- a/api/knowledge.js
+++ b/api/knowledge.js
@@ -4,7 +4,7 @@ import request from "@/utils/request";
* 课程文章分类
*/
export function getCategory(data) {
- return request.get("/api/CourseCategory", data);
+ return request.get("/CourseCategory", data);
}
/**
@@ -25,11 +25,25 @@ export function getArticleDetails(data) {
* 获取学习榜单列表
*/
export function getStudyList(data) {
- return request.post("/api/StudyList/listStudyList",data);
+ return request.post("/StudyList/listStudyList",data);
}
/**
* 获取课程列表
*/
export function getCourses(data) {
- return request.post("/api/cyCourse/listCourses",data);
+ return request.post("/Course/listCourses",data);
+}
+
+/**
+ * 获取课程详情
+ */
+export function getCourseDetail(data) {
+ return request.post("/Course/courseDetail",data);
+}
+
+/**
+ * 报名
+ */
+export function enterCourse(data) {
+ return request.post("/user/enterCourse",data);
}
\ No newline at end of file
diff --git a/components/uni-countdown/uni-countdown.vue b/components/uni-countdown/uni-countdown.vue
index 1631928..596ea63 100644
--- a/components/uni-countdown/uni-countdown.vue
+++ b/components/uni-countdown/uni-countdown.vue
@@ -1,13 +1,13 @@
{{ d }}
- 天
+ 天
{{ h }}
- {{ showColon ? ':' : '时' }}
+ {{ showColon ? ':' : '时' }}
{{ i }}
- {{ showColon ? ':' : '分' }}
+ {{ showColon ? ':' : '分' }}
{{ s }}
- 秒
+ 秒
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 691ab8a..d25b70d 100644
--- a/pages.json
+++ b/pages.json
@@ -568,24 +568,6 @@
"selectedIconPath": "static/tab5.png",
"text": "我的"
}
- // {
- // "pagePath": "pages/shop/GoodsClass/index",
- // "iconPath": "static/icon-class.png",
- // "selectedIconPath": "static/icon-class-hot.png",
- // "text": "分类"
- // },
- // {
- // "pagePath": "pages/shop/ShoppingCart/index",
- // "iconPath": "static/icon-cart.png",
- // "selectedIconPath": "static/icon-cart-hot.png",
- // "text": "购物车"
- // },
- // {
- // "pagePath": "pages/user/User/index",
- // "iconPath": "static/icon-user.png",
- // "selectedIconPath": "static/icon-user-hot.png",
- // "text": "我的"
- // }
]
}
}
diff --git a/pages/authorization/index.vue b/pages/authorization/index.vue
index 68ea8b1..966ac6f 100644
--- a/pages/authorization/index.vue
+++ b/pages/authorization/index.vue
@@ -64,7 +64,7 @@ export default {
...mapMutations(['updateAuthorizationPage']),
toLogin() {
this.$yrouter.push({
- path: '/pages/user/Login/index',
+ path: '/pagesB/pages/user/Login/index',
query: {},
})
},
diff --git a/pages/course/detail.vue b/pages/course/detail.vue
index 9584582..6ea7919 100644
--- a/pages/course/detail.vue
+++ b/pages/course/detail.vue
@@ -1,201 +1,293 @@
-
-
-
-
-
-
-
-
-
-
-
- 【一代天骄王者少年】禪易课程教学
-
- 国学
- 国学院
+
+
+
+
+
+
+
-
-
- 简介
- 课程安排
- 相关推荐
-
-
-
-
-
-
-
- 主讲人介绍
-
-
-
- 刘老师
- 禪易能量高级讲师
- 抱朴书院孕育自华夏优秀传统文化，以“博学致用抱朴含虚”为院训，以“弘扬国粹，利益社会”为动力。
-
-
-
-
-
- 课程简介
+
+ {{detail.courseName}}
+
+ {{detail.categoryName}}
+
+
+
+
+ 简介
+ 课程安排
+ 相关推荐
+
+
+
+
+
+
+
+ 主讲人介绍
+
+
+
+
+ {{item.name}}
+ 禪易能量高级讲师
+ {{item.introduction}}
+
+
-
- 抱朴书院孕育自华夏优秀传统文化，以“博学致用抱朴含虚”为院训，以“弘扬国粹，利益社会”为动力。\n
- 抱朴书院孕育自华夏优秀传统文化，以“博学致用抱朴含虚”为院训，以“弘扬国粹，利益社会”为动力。
-
-
-
-
-
- 课程表
+
+
+
+ 课程简介
+
+ {{item.courseIntroduce}}
-
-
-
- 课程时间
- 2021.5.31 - 2021.6.3
+
+
+
+ 课程表
-
-
- 课程地点
- 湖北 武汉
+
+
+
+ 课程时间
+ {{detail.courseStartTime}}
+
+
+
+ 课程地点
+ {{detail.coursePlace}}
+
+
+
+ 签到时间
+ {{detail.enterStartTime}}
+
+
+
+ 报名截止
+ {{detail.signEndTime}}
+
-
-
- 签到时间
- 2021.5.31 - 2021.6.3
+
+
+
+
+ 课程安排
-
-
- 报名截止
- 2021.5.31 - 2021.6.3
+
+ {{item.courseDate.split(' ')[0]}}
+ {{item.courseContent}}
-
-
-
-
-
- 课程安排
-
-
- 1.1、如何设定自己的吸财、守财的银行卡密码
- 1.2、如何设定自己的吸财、守财的银行卡号
- 1.3、如何设定自己的利财运、利婚姻、利子孙，名利双收手机号
- 1.4、如何选择自己用不发生车祸的车牌号
- 1.5、如何选择家族兴旺的门牌号
- 1.6、如何运用数字进行预测
-
-
-
-
-
- 相关推荐
-
-
-
-
-
-
-
-
- {{item.title}}
- {{item.synopsis}}
-
- {{item.chargeType == 0 ? '免费' : item.articleCharge}}
- {{item.addTime}}
-
-
+
+
+
+ 相关推荐
+
-
-
-
-
-
- 《阴阳五行》一个人的阴阳五的阴阳五行…
- 2021-5-31-6.3 8:30-18:30
- 中国 武汉
-
- ￥3000
- 去报名
+
+
+
+
+
+
+ {{item.courseName}}
+ {{setDate(item.courseStartTime)}}-{{setDate(item.courseEndTime)}}
+ {{item.coursePlace}}
+
+ ￥{{item.courseCharge}}
+ 去报名
+
-
-
-
-
@@ -255,6 +350,7 @@
.dialog-box{
width: 600rpx;
border-radius: 12rpx;
+ overflow: hidden;
position: absolute;
top: 50%;
left: 50%;
@@ -313,6 +409,14 @@
height: 340rpx;
swiper{
height: 100%;
+ .swiper-item{
+ width: 100%;
+ height: 100%;
+ image{
+ width: 100%;
+ height: 100%;
+ }
+ }
}
}
.course-info-box{
@@ -393,26 +497,35 @@
color: #666666;
line-height: 24px;
}
+ .scroll-view_H{
+ white-space: nowrap;
+ width: 100%;
+ }
.info-box{
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
+ width: 100%;
+ display: inline-block;
+ text-align: center;
image{
width: 100rpx;
height: 100rpx;
border-radius: 25px;
}
.name{
+ width: 100%;
font-size: 32rpx;
color: #3C464F;
line-height: 44rpx;
}
.tip{
+ width: 100%;
font-size: 24rpx;
color: #999999;
line-height: 34px;
}
+ .desc{
+ width: 100%;
+ white-space: pre-wrap;
+ }
}
.title-box{
font-size: 36rpx;
@@ -427,6 +540,16 @@
margin-right: 16rpx;
}
}
+ .plan-box{
+ font-size: 28rpx;
+ color: #666;
+ line-height: 32rpx;
+ margin-bottom: 12rpx;
+ .plan-time{
+ width: 170rpx;
+ margin-right: 22rpx;
+ }
+ }
.course-card-item{
font-size: 32rpx;
image{
@@ -572,6 +695,7 @@
text-align: center;
line-height: 80rpx;
color: #fff;
+ font-size: 30rpx;
}
}
diff --git a/pages/course/index.vue b/pages/course/index.vue
index 321b7e3..f455566 100644
--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -37,7 +37,7 @@
- 国学·琴
+ {{categoryTitle}}
@@ -52,7 +52,7 @@
-
+
@@ -74,6 +74,7 @@