diff --git a/.env.development b/.env.development index 7c776625..5bae6850 100644 --- a/.env.development +++ b/.env.development @@ -6,11 +6,11 @@ ENV = 'development' # 苗扬 -#VITE_APP_BASE_API_Url = 'http://25.64.16.133:9786' +# VITE_APP_BASE_API_Url = 'http://25.64.16.133:9786' -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' +# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' -# app入口 -#VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' +app入口 +VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json new file mode 100644 index 00000000..8ae452a8 --- /dev/null +++ b/.hbuilderx/launch.json @@ -0,0 +1,9 @@ +{ + "version" : "1.0", + "configurations" : [ + { + "playground" : "standard", + "type" : "uni-app:app-android" + } + ] +} diff --git a/src/api/common.js b/src/api/common.js index 11b27be7..963bbfa9 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -40,8 +40,8 @@ export const uploadFile = (file, data) => { }; -// 对象存储预览 /traoss/tras3/show/{文件ID} -export function previewFile(id,responseType = 'arraybuffer') { +// 对象存储预览 /traoss/tras3/show/{文件ID} +export function previewFile(id, responseType = 'arraybuffer') { const token = getToken(); const header = { "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", @@ -67,4 +67,32 @@ export function previewFile(id,responseType = 'arraybuffer') { } }); }); +} +// 缩略图预览 /traoss/tras3/getCacheThumbImage/{fileId}/{width}/{height} +export function previewCacheThumbImage(id, width = 30, height = 30) { + const token = getToken(); + const header = { + "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", + }; + if (token) + header['summary'] = token + let baseUrl = get_base_url(); + + return new Promise((resolve, reject) => { + uni.request({ + url: `${baseUrl}/traoss/tras3/getCacheThumbImage/${id}/${width}/${height}`, + header, + responseType, + success(result) { + console.log(result) + let _header = result.header['content-type'].split(';')[0] + // let base64 = new Blob([result.data],{type:result.header['content-type'].split(';')[0]}) + let base64 = `data:${_header};base64,` + uni.arrayBufferToBase64(result.data) + resolve(base64) + }, + fail(error) { + reject(new Error('Upload failed')); + } + }); + }); } \ 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 d51da45c..412a4406 100644 --- a/src/components/image-preview/image-preview.vue +++ b/src/components/image-preview/image-preview.vue @@ -1,22 +1,33 @@ diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue index e4c7ffed..56535efe 100644 --- a/src/pages/course/components/talkingItem.vue +++ b/src/pages/course/components/talkingItem.vue @@ -24,11 +24,18 @@ - - - 继续学 - 重新学 - 继续 + + + + + + + + 继续学 + + + 继续 + @@ -50,7 +57,13 @@ - + + + + + @@ -132,7 +145,6 @@ float: left; width: 46rpx; height: 46rpx; - background-color: #ccc; overflow: hidden; margin-right: 16rpx; margin-top: 25rpx; @@ -141,45 +153,83 @@ float: left; width: 46rpx; height: 46rpx; - background-color: #ccc; overflow: hidden; margin-right: 16rpx; margin-top: 25rpx; } .next-learn-btn{ float: left; - padding: 0 20rpx; + padding: 0 60rpx 0 20rpx; height: 62rpx; line-height: 62rpx; - font-size: 32rpx; + font-size: 30rpx; background-color: #06f; color: #fff; border-radius: 8rpx; margin-top: 16rpx; margin-right: 16rpx; + position: relative; + .icon-iamge{ + width: 25rpx; + height: 25rpx; + position: absolute; + right: 20rpx; + top: 50%; + margin-top: -12rpx; + } } .replay-learn-btn{ float: left; - padding: 0 20rpx; + padding: 0 60rpx 0 20rpx; height: 62rpx; line-height: 62rpx; - font-size: 32rpx; + font-size: 30rpx; color: #06f; background-color: #eaf2ff; border-radius: 8rpx; margin-top: 16rpx; margin-right: 16rpx; + position: relative; + .icon-iamge{ + width: 25rpx; + height: 25rpx; + position: absolute; + right: 20rpx; + top: 50%; + margin-top: -12rpx; + } + } + .replay-study-btn{ + width: 162rpx; + height: 62rpx; + border-radius: 8rpx; + float: right; + margin-top: 16rpx; + .icon-iamge{ + width: 100%; + height: 100%; + margin:0; + } } .next-btn{ float: right; - padding: 0 20rpx; + padding: 0 60rpx 0 20rpx; height: 62rpx; line-height: 62rpx; - font-size: 32rpx; + font-size: 30rpx; background-color: #06f; color: #fff; border-radius: 8rpx; margin-top: 16rpx; + position: relative; + .icon-iamge{ + width: 25rpx; + height: 25rpx; + position: absolute; + right: 20rpx; + top: 50%; + margin-top: -12rpx; + } } } } @@ -236,7 +286,6 @@ float: left; width: 46rpx; height: 46rpx; - background-color: #ccc; overflow: hidden; margin-right: 16rpx; margin-top: 25rpx; @@ -245,21 +294,29 @@ float: left; width: 46rpx; height: 46rpx; - background-color: #ccc; overflow: hidden; margin-right: 16rpx; margin-top: 25rpx; } .next-btn{ float: right; - padding: 0 20rpx; + padding: 0 60rpx 0 20rpx; height: 62rpx; line-height: 62rpx; - font-size: 32rpx; + font-size: 30rpx; background-color: #06f; color: #fff; border-radius: 8rpx; margin-top: 16rpx; + position: relative; + .icon-iamge{ + width: 25rpx; + height: 25rpx; + position: absolute; + right: 20rpx; + top: 50%; + margin-top: -12rpx; + } } } } diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue index 49e853b5..abbcc608 100644 --- a/src/pages/course/index.vue +++ b/src/pages/course/index.vue @@ -24,7 +24,7 @@ > - 筛选 + 筛选 diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index b06f14e2..ff6246ac 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -3,7 +3,18 @@ - + + + + 语言选择，开启学习之旅 + + + + + + + + 课程学习 @@ -25,6 +36,7 @@ import { onLoad } from '@dcloudio/uni-app'; import common from '@/common/common'; import TalkingItem from '@/pages/course/components/talkingItem.vue' const crsNum = ref(''); +const step = ref(1) const getData = async () => { console.log(crsNum.value) }; @@ -109,6 +121,11 @@ onLoad((params) => { font-weight: 400; } } + .voice-list{ + flex:1; + overflow-y: auto; + padding: 30rpx; + } } } diff --git a/src/static/images/course/goon.png b/src/static/images/course/goon.png new file mode 100644 index 00000000..034ad221 Binary files /dev/null and b/src/static/images/course/goon.png differ diff --git a/src/static/images/course/jianpan.png b/src/static/images/course/jianpan.png new file mode 100644 index 00000000..0f6d8e04 Binary files /dev/null and b/src/static/images/course/jianpan.png differ diff --git a/src/static/images/course/pause-focus.png b/src/static/images/course/pause-focus.png new file mode 100644 index 00000000..d8293c64 Binary files /dev/null and b/src/static/images/course/pause-focus.png differ diff --git a/src/static/images/course/pause.png b/src/static/images/course/pause.png new file mode 100644 index 00000000..7bb83328 Binary files /dev/null and b/src/static/images/course/pause.png differ diff --git a/src/static/images/course/play.png b/src/static/images/course/play.png new file mode 100644 index 00000000..cbe9ee8d Binary files /dev/null and b/src/static/images/course/play.png differ diff --git a/src/static/images/course/replay.png b/src/static/images/course/replay.png new file mode 100644 index 00000000..a03d5a62 Binary files /dev/null and b/src/static/images/course/replay.png differ diff --git a/src/static/images/course/restart.png b/src/static/images/course/restart.png new file mode 100644 index 00000000..c7c705bd Binary files /dev/null and b/src/static/images/course/restart.png differ diff --git a/src/static/images/course/restart2.png b/src/static/images/course/restart2.png new file mode 100644 index 00000000..926ff53c Binary files /dev/null and b/src/static/images/course/restart2.png differ diff --git a/src/static/images/course/restudy.png b/src/static/images/course/restudy.png new file mode 100644 index 00000000..e8798d8a Binary files /dev/null and b/src/static/images/course/restudy.png differ diff --git a/src/static/images/course/score.png b/src/static/images/course/score.png new file mode 100644 index 00000000..f647c09b Binary files /dev/null and b/src/static/images/course/score.png differ