diff --git a/.env.development b/.env.development
index 948cb700..c27d2b64 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,12 @@ ENV = 'development'
# 苗扬
# VITE_APP_BASE_API_Url = 'http://25.64.16.133:9786'
+# UAT
+# VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786'
+
+# DEV
VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+
# http://25.18.122.65:7001/download/dev-jax.apk
# app入口
#VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
diff --git a/src/common/common.js b/src/common/common.js
index 3384863f..0abbddac 100644
--- a/src/common/common.js
+++ b/src/common/common.js
@@ -33,8 +33,9 @@ const loading = (title = '加载中', mask = true) => uni.showLoading({
const hideLoading = () => uni.hideLoading()
// 保留当前页面,跳转到应用内的某个页面,使用uni.navigateBack可以返回到原页面。
-const navigateTo = url => uni.navigateTo({
- url: url
+const navigateTo = (url, data = {}) => uni.navigateTo({
+ url: url,
+ ...data
});
// 关闭所有页面,打开到应用内的某个页面。
const reLaunch = url => {
diff --git a/src/components/course-item/course-item.vue b/src/components/course-item/course-item.vue
index d96ac18b..37871bbc 100644
--- a/src/components/course-item/course-item.vue
+++ b/src/components/course-item/course-item.vue
@@ -1,7 +1,7 @@
-
+
{{itemInfo.evalGrade}}
diff --git a/src/components/image-preview/image-preview.vue b/src/components/image-preview/image-preview.vue
index 932e2628..c281727d 100644
--- a/src/components/image-preview/image-preview.vue
+++ b/src/components/image-preview/image-preview.vue
@@ -34,7 +34,7 @@
default:50,
type:[String, Number]
},
- isCache:{
+ isCache:{ // 获取缩略图
type: Boolean,
default: false
},
diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index 02f71b4f..08829578 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -389,7 +389,21 @@ const audioCacheObj = computed(() => storageStore.audioObj)
itemVoice.value = unref(dataInfo).talkingVoice
talkVoiceObj.value.src = itemVoice.value
setTimeout(()=>{
- voiceTime.value = ( Math.ceil(talkVoiceObj.value.duration) || 0 ) + 's'
+ setVoiceTime(0)
+ },100)
+ }
+ }
+ const setVoiceTime = (sum) => {
+ sum += 1
+ if(talkVoiceObj.value.duration){
+ voiceTime.value = ( Math.ceil(talkVoiceObj.value.duration) || 0 ) + 's'
+ }else{
+ if(sum === 5) {
+ voiceTime.value = 0 + 's'
+ return
+ }
+ setTimeout(()=>{
+ setVoiceTime(sum)
},100)
}
}
diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue
index 462a670e..d6015138 100644
--- a/src/pages/course/components/touchBtn.vue
+++ b/src/pages/course/components/touchBtn.vue
@@ -2,7 +2,7 @@
{
})
const recNum = ref(1)
const activeNum = ref(1)
+
+const getRecordPermission = (obj) => {
+//#ifdef APP-PLUS
+ uni.getSetting({
+ success: (res) => {
+ if(!res.authSetting['scope.record']){
+ // 没有授权,请求授权
+ uni.authorize({
+ scope: 'scope.record',
+ success:() => {
+ showOverlayTalking(obj)
+ },
+ fail: () => {
+ common.msg('请设置开启录音权限!')
+ }
+ })
+ }else{
+ showOverlayTalking(obj)
+ }
+ }
+ })
+// #endif
+//#ifndef APP-PLUS
+ showOverlayTalking(obj)
+// #endif
+}
const showOverlayTalking = (obj) => {
recNum.value += 1
emit('startRecord')
- if(answerType.value === 4){
+ if(!isDisabled.value){
showTalkingModel.value = true
touchX.value = obj.changedTouches[0].pageX
touchY.value = obj.changedTouches[0].pageY
@@ -142,7 +168,7 @@ const handleMove = (obj) => {
}
// 发送文本
const showKeyboard = () => {
- if(answerType.value === 4){
+ if(!isDisabled.value){
if(keyboardIsShow.value){
if(answerValue.value){
emit(
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index fbc614dc..2c4583bb 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -3,9 +3,9 @@
-
- {{chooseRate}}倍
-
+
+ {{chooseRate}}倍
+
@@ -38,9 +38,9 @@
-
- {{chooseRate}} 倍
-
+
+ {{chooseRate}}倍
+
@@ -82,7 +82,7 @@
@uploadVoice="uploadRecordNow"
@submitAnswer="submitAnswerNow"
@startRecord="changePlayItemId('')"
- :answerType="lastTalkingInfo.type||0"
+ :isDisabled="(lastTalkingInfo.type||0) !== 4"
/>
@@ -100,6 +100,21 @@
+
+
+
+ 设置
+
+
+ {{item}}
+
+
+
+
@@ -224,6 +239,10 @@ const showChangeSeekModelNow = () => {
// changePlayItemId()
showSeekModel.value = true
}
+const showBgModel = ref(false)
+const showChangeBgModelNow = () => {
+ showBgModel.value = true
+}
// 关闭播放状态
const changePlayItemId = (id = '') => {
if(activeVoiceTalkingItemId.value === id){
@@ -318,6 +337,18 @@ const getGraphInfoUnStudy = (flag = 0) => {
if(!_body.chatBody) {
return
}
+ if(Number(_body.bodyTyp) === 7){
+ common.show('恭喜你已学完全部知识点', '有什么心得跟我们分享吗?',true, '取消','去评论').then((res) => {
+ if(res) {
+ // 去评论
+ common.navigateTo(`/pages/courseDetail/submit?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`)
+ }else{
+ // 取消
+ common.navigateTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`)
+ }
+ }).finally(() => {})
+ return
+ }
lastTalkingInfo.value = {
crsId: crsId.value,
qstLogId: _body.chatBody,
@@ -355,7 +386,6 @@ const getQuestionInfoUnStudy = (pgrphId) => {
.then(res=>{
let _id = new Date().getTime() + 'id'
let _body = res.body || {}
- console.log(_body.chatBody)
if(_body.chatBody && _body.chatBody?.stdyStat !== 'N'){
let _id = new Date().getTime() + 'id'
lastTalkingInfo.value = {
@@ -693,7 +723,7 @@ const finishQuestionNow = (data) => {
common.msg('提交答案失败!')
return
}
- let _id1 = new Date().getTime() + 'id'
+ let _id1 = new Date().getTime() + '3d'
talkingList.value.push({
id: _id1,
talkingContent: '完成',
@@ -879,6 +909,9 @@ const chooseRateNow = (item) => {
text-align: left;
box-sizing: border-box;
padding:0 40rpx 0 40rpx;
+ ::v-deep .uv-input__content{
+ padding-right: 50rpx;
+ }
}
}
.talk-btn-box{
diff --git a/src/pages/index/components/answer.vue b/src/pages/index/components/answer.vue
new file mode 100644
index 00000000..f63c3005
--- /dev/null
+++ b/src/pages/index/components/answer.vue
@@ -0,0 +1,9 @@
+
+ 答案
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/index/components/question.vue b/src/pages/index/components/question.vue
new file mode 100644
index 00000000..d26b6d27
--- /dev/null
+++ b/src/pages/index/components/question.vue
@@ -0,0 +1,157 @@
+
+
+
+
+
+ {{voiceTime}}
+
+
+ {{ showContent }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/index/components/talking-item.vue b/src/pages/index/components/talking-item.vue
new file mode 100644
index 00000000..690aa092
--- /dev/null
+++ b/src/pages/index/components/talking-item.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index badbb0ba..36d0ee0c 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -1,12 +1,342 @@
-
-
+
+
+
+
+
+
+ 设置
+
+
+
+
+ AI问答
+
+
+
+
+ Hi,我是{{'李想'}}
+ 工作学习,我都能帮你!
+ 试试他的能力
+
+
+
+
+
+ {{questionList[item-1]}}
+
+
+ {{questionList[item + Math.ceil(questionList.length/2)-1]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'AI学' }}
+
+
+
+ {{ 'AI练' }}
+
+
+
+ {{ 'AI考' }}
+
+
+
+ {{ '去PK' }}
+
+
+
+ {{ '任务' }}
+
+
+
+ {{ '错题' }}
+
+
+
+ {{ '分析' }}
+
+
+
+
+
-
\ No newline at end of file
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 3146e531..64a244e7 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -110,7 +110,8 @@ const login_fun = (): void => {
// this.$common.reLaunch('/pages/homepage/index');
// }, this.GLOBAL_TIMER_SUBMIT_DELAY_TIME);
- socketStore.creatSocket();
+ // 不再在登录时创建ws链接
+ // socketStore.creatSocket();
const pages = getCurrentPages();
diff --git a/src/static/images/dialog/answer-fankui.png b/src/static/images/dialog/answer-fankui.png
new file mode 100644
index 00000000..e125e580
Binary files /dev/null and b/src/static/images/dialog/answer-fankui.png differ
diff --git a/src/static/images/dialog/answer-restart.png b/src/static/images/dialog/answer-restart.png
new file mode 100644
index 00000000..0816704c
Binary files /dev/null and b/src/static/images/dialog/answer-restart.png differ
diff --git a/src/static/images/dialog/answer-stop.png b/src/static/images/dialog/answer-stop.png
new file mode 100644
index 00000000..14aa0ea2
Binary files /dev/null and b/src/static/images/dialog/answer-stop.png differ
diff --git a/src/static/images/dialog/answer-yifankui.png b/src/static/images/dialog/answer-yifankui.png
new file mode 100644
index 00000000..66ae2b59
Binary files /dev/null and b/src/static/images/dialog/answer-yifankui.png differ
diff --git a/src/static/images/dialog/answer-yizan.png b/src/static/images/dialog/answer-yizan.png
new file mode 100644
index 00000000..c30d48bf
Binary files /dev/null and b/src/static/images/dialog/answer-yizan.png differ
diff --git a/src/static/images/dialog/answer-zan.png b/src/static/images/dialog/answer-zan.png
new file mode 100644
index 00000000..6e5d97a6
Binary files /dev/null and b/src/static/images/dialog/answer-zan.png differ
diff --git a/src/static/images/dialog/icons/PK.png b/src/static/images/dialog/icons/PK.png
new file mode 100644
index 00000000..9ce27d73
Binary files /dev/null and b/src/static/images/dialog/icons/PK.png differ
diff --git a/src/static/images/dialog/icons/exam.png b/src/static/images/dialog/icons/exam.png
new file mode 100644
index 00000000..7797aa89
Binary files /dev/null and b/src/static/images/dialog/icons/exam.png differ
diff --git a/src/static/images/dialog/icons/static.png b/src/static/images/dialog/icons/static.png
new file mode 100644
index 00000000..120647d0
Binary files /dev/null and b/src/static/images/dialog/icons/static.png differ
diff --git a/src/static/images/dialog/icons/study.png b/src/static/images/dialog/icons/study.png
new file mode 100644
index 00000000..2f90dc95
Binary files /dev/null and b/src/static/images/dialog/icons/study.png differ
diff --git a/src/static/images/dialog/icons/task.png b/src/static/images/dialog/icons/task.png
new file mode 100644
index 00000000..bfb015bc
Binary files /dev/null and b/src/static/images/dialog/icons/task.png differ
diff --git a/src/static/images/dialog/icons/test.png b/src/static/images/dialog/icons/test.png
new file mode 100644
index 00000000..2cc2e3ee
Binary files /dev/null and b/src/static/images/dialog/icons/test.png differ
diff --git a/src/static/images/dialog/icons/wrong.png b/src/static/images/dialog/icons/wrong.png
new file mode 100644
index 00000000..3d7496cf
Binary files /dev/null and b/src/static/images/dialog/icons/wrong.png differ
diff --git a/src/static/images/dialog/pet-1.png b/src/static/images/dialog/pet-1.png
new file mode 100644
index 00000000..dd584161
Binary files /dev/null and b/src/static/images/dialog/pet-1.png differ
diff --git a/src/static/images/dialog/pet-2.png b/src/static/images/dialog/pet-2.png
new file mode 100644
index 00000000..2135f37a
Binary files /dev/null and b/src/static/images/dialog/pet-2.png differ
diff --git a/src/static/images/dialog/pet-3.png b/src/static/images/dialog/pet-3.png
new file mode 100644
index 00000000..fa68d3a7
Binary files /dev/null and b/src/static/images/dialog/pet-3.png differ