diff --git a/.env.development b/.env.development
index 80cab90f..0f91d31d 100644
--- a/.env.development
+++ b/.env.development
@@ -9,7 +9,7 @@ ENV = 'development'
# VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786'
# DEV
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
# app入口
#VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
@@ -17,4 +17,4 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003'
#VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
# h5专用地址
-VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7003'
\ No newline at end of file
+VITE_APP_BASE_H5_API_Url = 'http://aitstest.jlbank.com.cn:7001'
\ No newline at end of file
diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue
index 6b272a48..f5e49c48 100644
--- a/src/pages/course/components/touchBtn.vue
+++ b/src/pages/course/components/touchBtn.vue
@@ -9,13 +9,16 @@
>按住说话
-
-
-
-
+
+
+
+
@@ -83,6 +86,8 @@ watch(()=>props.onlyVoice,()=>{},{
})
const showTalkingModel = ref(false)
const keyboardIsShow = ref(false)
+
+
const answerValue = ref('')
const talkBtnRef = ref()
// 录音
@@ -267,17 +272,15 @@ const showKeyboard = () => {
}
if(!isDisabled.value){
if(keyboardIsShow.value){
- if(answerValue.value){
+ if(answerValue.value.trim()){
emit(
'submitAnswer',
answerValue.value,
- () => {
- keyboardIsShow.value = !keyboardIsShow.value
- answerValue.value = ''
- }
+ changeBtn
)
}else{
- keyboardIsShow.value = !keyboardIsShow.value
+ // keyboardIsShow.value = !keyboardIsShow.value
+ common.msg("不能发送空白消息！")
}
}else{
keyboardIsShow.value = !keyboardIsShow.value
@@ -290,6 +293,10 @@ const showKeyboard = () => {
})
}
}
+const changeBtn = () => {
+ keyboardIsShow.value = !keyboardIsShow.value
+ answerValue.value = ''
+}
diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue
index e0d7eb04..835e2e8d 100644
--- a/src/pages/course/index.vue
+++ b/src/pages/course/index.vue
@@ -32,11 +32,11 @@
{{item.label}}
-
+
{{itemT.label}}
-
+
@@ -284,6 +284,9 @@ import { onShow } from "@dcloudio/uni-app"
getPrdLineTypeListApi().then(res=>{
coursePrdlineList.value = res.body||[]
})
+ getTraTagListApi().then(res=>{
+ tagsTree.value = res.body||[]
+ })
changeTab({name:'全部'})
})
onActivated(() => {
@@ -369,8 +372,8 @@ import { onShow } from "@dcloudio/uni-app"
overflow-y: auto;
z-index: 2;
background-color: #f9f9f9;
- box-shadow: 0rpx 19rpx 19rpx rgba(160,160,160,.5);
- border-radius: 0 0 20rpx 20rpx;
+ box-shadow: 0rpx 12rpx 20rpx rgba(160,160,160,.25);
+ border-radius: 0 0 0rpx 0rpx;
padding: 0rpx 25rpx;
box-sizing: border-box;
.filter-type{
@@ -385,7 +388,8 @@ import { onShow } from "@dcloudio/uni-app"
.filter-type-list{
overflow: hidden;
.filter-type-item{
- width: calc(25% - 18rpx);
+ // width: calc(25% - 18rpx);
+ display: inline-block;
font-size: 29rpx;
box-sizing: border-box;
padding:0 20rpx;
@@ -401,7 +405,7 @@ import { onShow } from "@dcloudio/uni-app"
border-radius: 6rpx;
margin-bottom: 20rpx;
&:nth-child(4n){
- margin-right: 0;
+ margin-right: 24rpx;
}
&.is-active{
color: #06f;
diff --git a/src/pages/index/components/talking-item.vue b/src/pages/index/components/talking-item.vue
index 2a17752d..a539d4d5 100644
--- a/src/pages/index/components/talking-item.vue
+++ b/src/pages/index/components/talking-item.vue
@@ -49,7 +49,7 @@