diff --git a/.env.development b/.env.development index 6a083b27..91b5ab07 100644 --- a/.env.development +++ b/.env.development @@ -2,10 +2,12 @@ ENV = 'development' # 'development' -VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' +#VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' -#VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' + +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' + # DEV #VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' diff --git a/Android/simpleDemo/build.gradle b/Android/simpleDemo/build.gradle index 8b3a302a..a3e4e9c0 100644 --- a/Android/simpleDemo/build.gradle +++ b/Android/simpleDemo/build.gradle @@ -6,10 +6,10 @@ android { namespace 'cn.com.jlbank.ai' defaultConfig { applicationId "cn.com.jlbank.ai" - minSdkVersion 33 + minSdkVersion 29 targetSdkVersion 33 - versionName System.getenv("versionName") ?: "1.0.0" - versionCode System.getenv("versionCode")?.toInteger() ?: 281 + versionName System.getenv("versionName") ?: "1.0.3" + versionCode System.getenv("versionCode")?.toInteger() ?: 285 multiDexEnabled true compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/Android/ty-camera/build.gradle b/Android/ty-camera/build.gradle index b2459723..c89c5ef3 100644 --- a/Android/ty-camera/build.gradle +++ b/Android/ty-camera/build.gradle @@ -8,7 +8,7 @@ android { compileSdk 35 defaultConfig { - minSdk 33 + minSdk 29 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" } diff --git a/Android/ty-recording/build.gradle b/Android/ty-recording/build.gradle index c20249bc..ed5a3f4b 100644 --- a/Android/ty-recording/build.gradle +++ b/Android/ty-recording/build.gradle @@ -8,7 +8,7 @@ android { compileSdk 35 defaultConfig { - minSdk 33 + minSdk 29 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" } diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index 8fe43e28..2419e313 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -122,7 +122,7 @@ /> --> + :adjustPosition="true" :isDisabled="isHistory || isSending" :disabledText="''" style="margin-left: 10rpx;"/> @@ -364,6 +364,7 @@ setTimeout(() => { stopAnswerCallBack.value = null; answerIsOver.value = true; + isSending.value = false }, 10); return; } @@ -484,9 +485,13 @@ seqNo: seqNo.value } }); + talkQnsList.value = []; sendMessage({ commond: 'ASK', - body: data.askData + body: { + ...data.askData, + isReload: true + } }); // // 设置停止回调 // stopAnswerCallBack.value = ($data) => { @@ -717,7 +722,7 @@ }; // 新发送语音前loading动画 const sendLoading = () => { - isSending.value = true + isSending.value = true talkQnsList.value = []; talkingList.value.push({ type: 'question', @@ -738,7 +743,7 @@ // } if (!ossKey) { talkingList.value.pop(); - isSending.value = false + isSending.value = false uni.showToast({ title: '系统异常,请联系管理员', icon: 'none', @@ -757,7 +762,7 @@ }); } else { talkingList.value.pop(); - isSending.value = false + isSending.value = false uni.showToast({ title: '未识别到文字', icon: 'none', diff --git a/src/pages/pointsMall/pointsMall.vue b/src/pages/pointsMall/pointsMall.vue index 4fd5d309..32de24ce 100644 --- a/src/pages/pointsMall/pointsMall.vue +++ b/src/pages/pointsMall/pointsMall.vue @@ -5,7 +5,7 @@ @query="queryList" class="scroll_div" :auto="true" - empty-view-text="暂无学习任务" + empty-view-text="暂无兑换活动" >