Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

src/pages/course/components/touchBtn.vue

@@ -10,7 +10,7 @@
 		</view>
 		<view class="touch-btn" v-if="keyboardIsShow">
 			<uv-input class="input-box" ref="inputRef" v-model.trim="answerValue" maxlength="500"
-				placeholderStyle='color:#999999;font-size:26rpx' placeholder="请输入答案">
+				placeholderStyle='color:#999999;font-size:26rpx' placeholder="请输入文字">
 			</uv-input>
 		</view>
 		<view class="talk-btn-box"  @click.stop="showKeyboard" v-show="!onlyVoice">
@@ -115,7 +115,6 @@ const initRecord = () => {
 		let _recordPerm = uni.getAppAuthorizeSetting()
 		let _state = _recordPerm.microphoneAuthorized
 		if(_state === 'authorized'){
-			console.log('大大大大大');
 			showTalkingModel.value = true
 		}
 	})

src/pages/course/index.vue

@@ -284,12 +284,13 @@ import { onShow } from "@dcloudio/uni-app"
 		getPrdLineTypeListApi().then(res=>{
 			coursePrdlineList.value = res.body||[]
 		})
-		getTraTagListApi().then(res=>{
-			tagsTree.value = res.body||[]
-		})
 		changeTab({name:'全部'})
 	})
   onActivated(() => {
+		// 重新获取标签信息
+		getTraTagListApi().then(res=>{
+			tagsTree.value = res.body||[]
+		})
 		changeTab({name:activeTab.value || '全部'})
 	});
 </script>

src/pages/index/dialog.vue

@@ -412,7 +412,7 @@
 				} else {
 					talkingList.value.pop()
 					uni.showToast({
-						title: '语音内容不能为空！',
+						title: '未识别到文字！',
 						icon: "none",
 						duration: 1000
 					});