diff --git a/src/components/image-preview/image-preview.vue b/src/components/image-preview/image-preview.vue
index c8fb927c..62cc3ded 100644
--- a/src/components/image-preview/image-preview.vue
+++ b/src/components/image-preview/image-preview.vue
@@ -1,19 +1,34 @@
-
+
\ No newline at end of file
diff --git a/src/components/image-preview/preview-detail.vue b/src/components/image-preview/preview-detail.vue
index 5b369f42..4d1d557d 100644
--- a/src/components/image-preview/preview-detail.vue
+++ b/src/components/image-preview/preview-detail.vue
@@ -1,32 +1,41 @@
\ No newline at end of file
diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue
index 67859f18..2644c7ff 100644
--- a/src/pages/course/components/touchBtn.vue
+++ b/src/pages/course/components/touchBtn.vue
@@ -65,7 +65,7 @@
onHide,
onShow
} from '@dcloudio/uni-app';
-
+
const storageStore = useStorageStore();
const proxy = getCurrentInstance();
@@ -175,7 +175,7 @@
recordObjCom.value = uni.getRecorderManager();
unref(recordObjCom)?.onStop((res, duration) => {
isRecording.value = false
- if(isGettingPermission.value){
+ if (isGettingPermission.value) {
isGettingPermission.value = false
return
}
@@ -207,7 +207,7 @@
isRecording.value = true
recordTime.value = 0
setRecordTime()
- if(isGettingPermission.value){
+ if (isGettingPermission.value) {
isGettingPermission.value = false
return
}
@@ -228,12 +228,12 @@
});
};
const setRecordTime = () => {
- setTimeout(()=>{
- if(isRecording.value){
+ setTimeout(() => {
+ if (isRecording.value) {
recordTime.value += 1
setRecordTime()
}
- },1000)
+ }, 1000)
}
const isRecording = ref(false)
const recordTime = ref(0)
@@ -310,19 +310,19 @@
return;
}
//#ifdef APP-PLUS
- if(!hasPermission.value){
+ if (!hasPermission.value) {
let _res = await getPermission()
if (_res) {
hasPermission.value = true
- setTimeout(()=>{
- if(!isGettingPermission.value){
+ setTimeout(() => {
+ if (!isGettingPermission.value) {
showOverlayTalking(obj);
- }else{
+ } else {
isGettingPermission.value = false
}
- },100)
+ }, 100)
}
- }else{
+ } else {
showOverlayTalking(obj);
}
// #endif
@@ -474,14 +474,14 @@
icon: 'none',
duration: 1000
});
- }
+ }
};
const changeBtn = () => {
if (props.isDisabled) return;
keyboardIsShow.value = !keyboardIsShow.value;
answerValue.value = '';
};
- onHide(()=>{
+ onHide(() => {
isGettingPermission.value = true
})
@@ -496,31 +496,38 @@
.touch-btn {
height: 92rpx;
- // box-shadow: 0 8rpx 20rpx 0 rgba(0, 0, 0, 0.06);
+ box-shadow: 0 8rpx 20rpx 0 rgba(0, 0, 0, 0.06);
text-align: center;
line-height: 92rpx;
- background-color: #06f;
+ font-size: 28rpx;
+ color: #000;
font-weight: 400;
position: relative;
- color: #fff;
- font-size: 29rpx;
- border-radius: 23rpx;
- .center-text {
- height: 35rpx;
- line-height: 35rpx;
+ .input-box {
width: 100%;
- position: absolute;
- top: 50%;
- transform: translateY(-50%);
- display: flex;
- justify-content: center;
+ height: 92rpx;
+ line-height: 92rpx;
+ text-align: left;
+ box-sizing: border-box;
+ padding: 0 40rpx 0 40rpx;
}
+ }
- .type-icon {
- width: 35rpx;
- height: 35rpx;
- margin-right: 10rpx;
+ .talk-btn-box {
+ position: absolute;
+ height: 100%;
+ width: 120rpx;
+ right: 0;
+ top: 0;
+
+ .talk-btn-icon {
+ width: 40rpx;
+ height: 40rpx;
+ position: absolute;
+ right: 60rpx;
+ top: 50%;
+ margin-top: -20rpx;
}
}
}
@@ -581,6 +588,7 @@
line-height: 116rpx;
pointer-events: none;
display: flex;
+
.close-btn {
padding-top: 40rpx;
line-height: 28rpx;
@@ -659,6 +667,7 @@
}
}
}
+
::v-deep .uv-input__content__field-wrapper__field {
padding-right: 60rpx;
}
@@ -671,43 +680,7 @@
// position: relative;
// z-index: v-bind(btnZindex);
- // .touch-btn {
- // height: 92rpx;
- // box-shadow: 0 8rpx 20rpx 0 rgba(0, 0, 0, 0.06);
- // text-align: center;
- // line-height: 92rpx;
- // font-size: 28rpx;
- // color: #000;
- // font-weight: 400;
- // position: relative;
- // .input-box {
- // width: 100%;
- // height: 92rpx;
- // line-height: 92rpx;
- // text-align: left;
- // box-sizing: border-box;
- // padding: 0 40rpx 0 40rpx;
- // }
- // }
-
- // .talk-btn-box {
- // position: absolute;
- // height: 100%;
- // width: 120rpx;
- // right: 0;
- // top: 0;
-
- // .talk-btn-icon {
- // width: 40rpx;
- // height: 40rpx;
- // position: absolute;
- // right: 60rpx;
- // top: 50%;
- // margin-top: -20rpx;
- // }
- // }
- // }
// .overlay-box {
// display: flex;
diff --git a/src/pages/sparring/talkVideo.nvue b/src/pages/sparring/talkVideo.nvue
index 44050056..fdd08fdc 100644
--- a/src/pages/sparring/talkVideo.nvue
+++ b/src/pages/sparring/talkVideo.nvue
@@ -24,7 +24,7 @@