diff --git a/src/pages/analytics/study.vue b/src/pages/analytics/study.vue
index cd94d9df..71bb9235 100644
--- a/src/pages/analytics/study.vue
+++ b/src/pages/analytics/study.vue
@@ -719,4 +719,11 @@
}
}
}
+ ::v-deep .uni-calendar--fixed{
+ bottom: auto;
+ top:0 !important;
+ }
+ ::v-deep .uni-calendar__mask{
+ background-color: rgba(0, 0, 0, 0);
+ }
\ No newline at end of file
diff --git a/src/pages/charts/index.vue b/src/pages/charts/index.vue
index 06e22078..33665241 100644
--- a/src/pages/charts/index.vue
+++ b/src/pages/charts/index.vue
@@ -243,7 +243,7 @@
position: relative;
height: 100vh;
width: 100vw;
- overflow: hidden;
+ overflow-y: auto;
box-sizing: border-box;
padding-top: $top-height;
@@ -260,17 +260,24 @@
.ranking-box {
height: calc(100% - $top-height);
- overflow: hidden;
+ padding-top: 250rpx;
+ // min-height: 600rpx;
+ // overflow: hidden;
position: absolute;
top: $top-height;
width: 100%;
z-index: 2;
+ // display: flex;
+ // flex-direction: column;
}
.nav-div {
- position: relative;
+ position: absolute;
+ top: 0;
overflow: hidden;
height: 70rpx;
+ z-index: 20;
+ width: 100%;
.back_div {
margin-right: 10rpx;
@@ -307,8 +314,11 @@
.title-view {
height: 180rpx;
- position: relative;
+ position: absolute;
+ top: 0;
padding-top: 20rpx;
+ z-index: 10;
+ width: 100%;
.cup-image {
position: absolute;
@@ -316,7 +326,7 @@
bottom: -33rpx;
width: 208rpx;
height: 208rpx;
- z-index: 0;
+ z-index: 11;
}
.title-desc {
@@ -331,11 +341,14 @@
position: absolute;
bottom: 20rpx;
left: 46rpx;
+ z-index: 12;
}
}
.ranking-body {
- height: calc(100% - 170rpx - 180rpx - 70rpx);
+ height: calc(100% - 170rpx);
+ min-height: 550rpx;
+ // flex: 1;
overflow: hidden;
background-color: #fff;
border-radius: 31rpx 31rpx 0 0;
diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue
index 3bd0a45c..67859f18 100644
--- a/src/pages/course/components/touchBtn.vue
+++ b/src/pages/course/components/touchBtn.vue
@@ -496,38 +496,31 @@
.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;
- font-size: 28rpx;
- color: #000;
+ background-color: #06f;
font-weight: 400;
position: relative;
+ color: #fff;
+ font-size: 29rpx;
+ border-radius: 23rpx;
- .input-box {
+ .center-text {
+ height: 35rpx;
+ line-height: 35rpx;
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;
+ transform: translateY(-50%);
+ display: flex;
+ justify-content: center;
+ }
+
+ .type-icon {
+ width: 35rpx;
+ height: 35rpx;
+ margin-right: 10rpx;
}
}
}
@@ -538,12 +531,16 @@
// justify-content: flex-end;
width: 100%;
height: 100%;
+ pointer-events: none;
+ max-height: 100vh;
+ justify-content: space-between;
.circle-bg-box {
height: 234rpx;
background: url(@/static/images/course/talking.png) no-repeat;
background-size: cover;
position: relative;
+ pointer-events: none;
.icon-box {
position: absolute;
@@ -553,10 +550,12 @@
margin-top: -24rpx;
width: 34rpx;
height: 48rpx;
+ pointer-events: none;
image {
width: 100%;
height: 100%;
+ pointer-events: none;
}
}
}
@@ -564,30 +563,40 @@
.tips-box {
height: 40rpx;
line-height: 40rpx;
+ font-size: 28rpx;
color: #c0c0c0;
text-align: center;
margin: 12rpx 0 24rpx;
+ pointer-events: none;
}
.btns-box {
height: 270rpx;
// padding: 0 120rpx;
width: 154rpx;
- margin: 0 auto 100rpx;
+ margin: 0 auto;
overflow: hidden;
font-size: 28rpx;
text-align: center;
line-height: 116rpx;
-
+ pointer-events: none;
+ display: flex;
.close-btn {
+ padding-top: 40rpx;
+ line-height: 28rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
float: left;
height: 100%;
- width: 154rpx;
+ width: 100%;
overflow: hidden;
color: #999;
+ pointer-events: none;
&.is-out {
color: #fff;
+ pointer-events: none;
}
}
@@ -597,11 +606,14 @@
width: 154rpx;
overflow: hidden;
color: #999;
+ pointer-events: none;
}
.btn-box {
width: 100%;
- height: 154rpx;
+ max-height: 152rpx;
+ pointer-events: none;
+ margin: 0 auto;
}
}
@@ -612,6 +624,7 @@
background-color: #06f;
border-radius: 32rpx;
position: relative;
+ pointer-events: none;
&.is-out {
background-color: #ff3e49;
@@ -628,6 +641,7 @@
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
+ pointer-events: none;
}
&::after {
@@ -641,38 +655,201 @@
bottom: -22rpx;
left: 50%;
margin-left: -22rpx;
- }
- }
-
- .white-bg-box {
- height: 365rpx;
- background-color: #fff;
- overflow: hidden;
- border-radius: 32rpx 32rpx 0 0;
- padding: 58rpx 36rpx;
-
- .box-title {
- font-size: 32rpx;
- font-weight: bold;
- line-height: 46rpx;
- margin-bottom: 46rpx;
- }
-
- .box-btns {
- height: 46rpx;
- line-height: 46rpx;
- display: flex;
- justify-content: space-between;
- color: #999;
-
- .is-active {
- color: #06f;
- }
+ pointer-events: none;
}
}
}
-
::v-deep .uv-input__content__field-wrapper__field {
padding-right: 60rpx;
}
+
+
\ No newline at end of file
diff --git a/src/pages/sparring/components/card-swiper.vue b/src/pages/sparring/components/card-swiper.vue
index 44d157b0..3bcce926 100644
--- a/src/pages/sparring/components/card-swiper.vue
+++ b/src/pages/sparring/components/card-swiper.vue
@@ -227,9 +227,10 @@
}
}
.card-items{
- padding: 0 24rpx;
- height: calc(100% - 352rpx);
- overflow-y: auto;
+ padding: 0 24rpx ;
+ // height: calc(100% - 352rpx);
+ overflow: hidden;
+ // overflow-y: auto;
}
.card-item {
width: 100%;
diff --git a/src/pages/sparring/components/touchBtn.vue b/src/pages/sparring/components/touchBtn.vue
index 2cc77294..5b6baf85 100644
--- a/src/pages/sparring/components/touchBtn.vue
+++ b/src/pages/sparring/components/touchBtn.vue
@@ -22,9 +22,9 @@
松开发送
- 取消
-
-
+ 取消
+
+
@@ -250,7 +250,10 @@
// #endif
//#ifndef APP-PLUS
const recordObjCom = ref({});
- const initRecord = () => {};
+ const initRecord = () => {
+
+ // talkModelRef.value.open()
+ };
// #endif
onMounted(async () => {
initRecord?.();
@@ -484,6 +487,8 @@
width: 100%;
height: 100%;
pointer-events: none;
+ max-height: 100vh;
+ justify-content: space-between;
.circle-bg-box {
height: 234rpx;
@@ -513,6 +518,7 @@
.tips-box {
height: 40rpx;
line-height: 40rpx;
+ font-size: 28rpx;
color: #c0c0c0;
text-align: center;
margin: 12rpx 0 24rpx;
@@ -523,17 +529,22 @@
height: 270rpx;
// padding: 0 120rpx;
width: 154rpx;
- margin: 0 auto 100rpx;
+ margin: 0 auto;
overflow: hidden;
font-size: 28rpx;
text-align: center;
line-height: 116rpx;
pointer-events: none;
-
+ display: flex;
.close-btn {
+ padding-top: 40rpx;
+ line-height: 28rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
float: left;
height: 100%;
- width: 154rpx;
+ width: 100%;
overflow: hidden;
color: #999;
pointer-events: none;
@@ -555,8 +566,9 @@
.btn-box {
width: 100%;
- height: 154rpx;
+ max-height: 152rpx;
pointer-events: none;
+ margin: 0 auto;
}
}
@@ -602,7 +614,6 @@
}
}
}
-
::v-deep .uv-input__content__field-wrapper__field {
padding-right: 60rpx;
}
diff --git a/src/pages/sparring/tip.vue b/src/pages/sparring/tip.vue
index 9fcd7cbe..68bde947 100644
--- a/src/pages/sparring/tip.vue
+++ b/src/pages/sparring/tip.vue
@@ -1,1027 +1,952 @@
-
-
-
-
-
-
-
-
- {{ detailInfo.traName }}
-
- 内容由AI生成
-
-
-
-
-
-
-
-
- {{ detailInfo.chaName }}
- {{ detailInfo.chaAge }}岁
-
-
-
-
-
-
- 预计时长: {{ detailInfo.traStartLimit }} ~ {{ detailInfo.traEndLimit }} 分钟
-
-
-
-
-
-
- {{ detailInfo.occupation }}
-
-
-
- {{ detailInfo.personality }}
-
-
-
- {{ detailInfo.thoughtProcess }}
-
-
-
- {{ detailInfo.chaDesc }}
-
-
-
-
- 场景描述
-
- {{ detailInfo.sceneDesc }}
-
-
- 陪练角色不具备主动终止场景陪练的功能,当用户完成预设陪练目标时,需由用户手动发起结束陪练操作。
-
-
- -请点击下方按钮开始{{ detailInfo.traInterTypDesc }}
-
-
-
-
-
-
- 结束陪练
-
-
-
-
-
-
-
-
- {{ detailInfo.traInterTypDesc }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ detailInfo.traName }}
+
+ 内容由AI生成
+
+
+
+
+
+
+
+
+ {{ detailInfo.chaName }}
+ {{ detailInfo.chaAge }}岁
+
+
+
+
+
+ 预计时长: {{ detailInfo.traStartLimit }} ~ {{ detailInfo.traEndLimit }} 分钟
+
+
+
+
+
+ {{ detailInfo.occupation }}
+
+
+
+ {{ detailInfo.personality }}
+
+
+
+ {{ detailInfo.thoughtProcess }}
+
+
+
+ {{ detailInfo.chaDesc }}
+
+
+
+
+ 场景描述
+
+ {{ detailInfo.sceneDesc }}
+
+ 陪练角色不具备主动终止场景陪练的功能,当用户完成预设陪练目标时,需由用户手动发起结束陪练操作。
+
+ -请点击下方按钮开始{{ detailInfo.traInterTypDesc }}
+
+
+
+
+
+
+ 结束陪练
+
+
+
+
+
+
+
+
+ {{ detailInfo.traInterTypDesc }}
+
+
+
+
+
+
+