diff --git a/.env.development b/.env.development
index da8a02c3..3044d9b9 100644
--- a/.env.development
+++ b/.env.development
@@ -4,3 +4,4 @@ ENV = 'development'
# base api
VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
+# VITE_APP_BASE_API_Url = 'http://25.64.16.133:9786'
diff --git a/src/api/course.js b/src/api/course.js
index 31eb14ab..9130365b 100644
--- a/src/api/course.js
+++ b/src/api/course.js
@@ -4,7 +4,7 @@ import request from '@/api/request'
// 获取课程分类树接口
export const getCourseTypeListApi = (data) => {
return request({
- url: '/app/traCrsCatalogInfo/courseQueryTraCrsCatalogInfoList',
+ url: '/traapp/app/traCrsCatalogInfo/courseQueryTraCrsCatalogInfoList',
method: 'post',
data
});
@@ -12,7 +12,7 @@ export const getCourseTypeListApi = (data) => {
// 获取生产线分类树接口
export const getPrdLineTypeListApi = (data) => {
return request({
- url: '/app/traPrdLineInfo/courseQueryTraPrdLineInfoList',
+ url: '/traapp/app/traPrdLineInfo/courseQueryTraPrdLineInfoList',
method: 'post',
data
});
@@ -20,7 +20,7 @@ export const getPrdLineTypeListApi = (data) => {
// 获取标签分类树 接口
export const getTraTagListApi = (data) => {
return request({
- url: '/app/traTagCatalogInfo/queryTraTagCatalogInfoList',
+ url: '/traapp/app/traTagCatalogInfo/queryTraTagCatalogInfoList',
method: 'post',
data
});
diff --git a/src/api/login.js b/src/api/login.js
index bc20076c..8f3389d1 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -6,7 +6,7 @@ const setUserInfo = data => uni.setStorageSync('userInfo', data)
// 账号登录接口
export const useAccountLoginApp = (data) => request({
- url: '/access/userLogin',
+ url: '/traapp/access/userLogin',
method: 'post',
data
}).then(async({ rtnCode, body }) => {
@@ -29,21 +29,21 @@ export const useAccountLoginApp = (data) => request({
// 获取个人信息
export const queryCurrentUser = (data) => request({
- url: '/access/queryCurrentUser',
+ url: '/traapp/access/queryCurrentUser',
method: 'post',
data
})
//获取隐私协议
export const getYsxy = (data) => request({
- url: '/dfAgtInfo/queryValidDfAgt',
+ url: '/traapp/dfAgtInfo/queryValidDfAgt',
method: 'post',
data
})
// 获取验证码（作废）
export const getLoginAppCheckCode = (data) => request({
- url: '/access/checkCode',
+ url: '/traapp/access/checkCode',
method: 'get',
data
})
\ No newline at end of file
diff --git a/src/api/request.js b/src/api/request.js
index 82f92dd1..987b4efe 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -8,10 +8,10 @@ const ENV = import.meta.env
export const get_base_url = url => {
if (process.env.NODE_ENV === 'development') {
// 开发环境
- return ENV.VITE_APP_BASE_API_Url + "/traapp"
+ return ENV.VITE_APP_BASE_API_Url
} else if (process.env.NODE_ENV === 'production') {
// 生产环境
- return ENV.VITE_APP_BASE_API_Url + "/traapp"
+ return ENV.VITE_APP_BASE_API_Url
}
}
@@ -21,17 +21,19 @@ export default function request({
data,
meta,
isStream,
- suppressErrors
+ suppressErrors,
+ header={}
}) {
const base_url = get_base_url(url);
- const header = {
+ const headers_base = {
'content-type': 'application/x-www-form-urlencoded; charset=UTF-8',
+ ...(header||{})
}
let token = getToken()
if (token) {
- header['summary'] = token // 让每个请求携带令牌
+ headers_base['summary'] = token // 让每个请求携带令牌
}
let that = this
return new Promise((resolve, reject) => {
@@ -39,7 +41,7 @@ export default function request({
url: `${base_url}${url}`,
data: data,
method: method,
- header: header,
+ header: headers_base,
success: (response) => {
if (isStream) { // 流式传输，直接返回
return resolve(response);
diff --git a/src/components/course-item/course-item.vue b/src/components/course-item/course-item.vue
index 97081824..882441ef 100644
--- a/src/components/course-item/course-item.vue
+++ b/src/components/course-item/course-item.vue
@@ -1,20 +1,92 @@
-
-
+
+
+
+ {{itemInfo.crsName}}
+
+ {{item.tagName}}
+
+ 发布：{{itemInfo.publicTime}}
+ 已学：{{itemInfo.learnedNum}}人次
+
-
\ No newline at end of file
diff --git a/src/components/image-preview/image-preview.vue b/src/components/image-preview/image-preview.vue
index 44965b37..01a92d38 100644
--- a/src/components/image-preview/image-preview.vue
+++ b/src/components/image-preview/image-preview.vue
@@ -1,9 +1,10 @@
-
+
+
@@ -102,6 +159,7 @@ import { onMounted } from 'vue'
}
.course-center-body{
position: absolute;
+ overflow: hidden;
left:0;
top: 0;
height: 100%;
@@ -120,6 +178,7 @@ import { onMounted } from 'vue'
font-weight: 500;
color:#000;
position: relative;
+ // margin-bottom: 23rpx;
.arrow-icon{
position: absolute;
left:36rpx;
@@ -139,6 +198,7 @@ import { onMounted } from 'vue'
}
.list-view{
flex:1;
+ overflow: hidden;
margin-bottom: 80rpx;
background: #ffffff;
border-radius: 23rpx;
@@ -164,10 +224,12 @@ import { onMounted } from 'vue'
}
.course-list{
display: flex;
- flex:1;
+ flex:1;
+ overflow: hidden;
.left-type-list{
width: 152rpx;
border-right: 2rpx solid #eee;
+ overflow-y: auto;
.type-item{
height: 90rpx;
line-height: 90rpx;
@@ -185,6 +247,12 @@ import { onMounted } from 'vue'
}
.right-course-list{
flex:1;
+ overflow-y: auto;
+ // .course-box{
+ // width: 100%;
+ // height: 100%;
+ // overflow-y: auto;
+ // }
}
}
}
diff --git a/src/pagesB.json b/src/pagesB.json
index 6e9c3836..c4004c85 100644
--- a/src/pagesB.json
+++ b/src/pagesB.json
@@ -1,5 +1,13 @@
{
"pages": [
-
+ {
+ "path": "pages/course/index",
+ "style": {
+ "navigationBarTitleText": "课程中心",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ }
]
}
\ No newline at end of file