diff --git a/.env.development b/.env.development
index 98646230..3c7e85d9 100644
--- a/.env.development
+++ b/.env.development
@@ -8,7 +8,9 @@ ENV = 'development'
# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
- # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
+
+# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
+
# VITE_APP_BASE_API_Url = 'http://192.168.247.200'
# VITE_APP_BASE_API_Url = 'http://aitscdn.jlbank.com.cn:7001'
diff --git a/src/pages/analytics/study.vue b/src/pages/analytics/study.vue
index 67859d6c..9c52ab1c 100644
--- a/src/pages/analytics/study.vue
+++ b/src/pages/analytics/study.vue
@@ -108,7 +108,7 @@
- {{item.title}}
+ {{item.title}}
{{item.content}}
@@ -117,7 +117,7 @@
- {{item.title}}
+ {{item.title}}
{{item.content}}
@@ -405,6 +405,9 @@
&-value {
font-size: 54rpx;
font-weight: 600;
+ &-v {
+ font-family: DINAlternate, DINAlternate;
+ }
&-unit {
font-size: 28rpx;
@@ -420,7 +423,7 @@
background-repeat: no-repeat;
background-size: auto 78rpx;
background-position: 26rpx 26rpx;
- padding: 100rpx 26rpx 24rpx;
+ padding: 80rpx 26rpx 24rpx;
border-radius: 15rpx;
margin-bottom: 24rpx;
position: relative;
@@ -431,20 +434,39 @@
left: 50%;
transform: translateX(-50%);
}
+ &::before{
+ content: '';
+ display: block;
+ position: absolute;
+ width: 208rpx;
+ height: 76rpx;
+ position: absolute;
+ left: -7rpx;
+ top: -12rpx;
+ background-size: cover;
+ }
&.dens {
- background-image: url(@/static/images/analytics/weidu.png);
+ &::before{
+ background-image: url(@/static/images/analytics/weidu-1.png);
+ }
}
&.study {
- background-image: url(@/static/images/analytics/study1.png)
+ &::before{
+ background-image: url(@/static/images/analytics/study1-1.png)
+ }
}
&.study1 {
- background-image: url(@/static/images/analytics/study.png);
+ &::before{
+ background-image: url(@/static/images/analytics/study-1.png);
+ }
}
&.course {
- background-image: url(@/static/images/analytics/course.png);
+ &::before{
+ background-image: url(@/static/images/analytics/course-1.png);
+ }
}
// .dens-item {
@@ -483,7 +505,7 @@
.item-title {
line-height: 40rpx;
position: relative;
- padding: 8rpx 46rpx 8rpx 26rpx;
+ padding: 8rpx 46rpx 8rpx 40rpx;
line-height: 42rpx;
font-size: 29rpx;
margin-bottom: 16rpx;
@@ -491,15 +513,22 @@
&::before {
content: '';
display: block;
- background-color: #000;
- width: 12rpx;
- height: 12rpx;
- border-radius: 50%;
+ // background-color: #000;
+ width: 28rpx;
+ height: 28rpx;
+ // border-radius: 50%;
position: absolute;
left: 0rpx;
- top: 22rpx;
+ top: 14rpx;
+ background-image: url(@/static/images/analytics/den-tips.png);
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ }
+ &.study2-tip{
+ &::before {
+ background-image: url(@/static/images/analytics/den-tips2.png);
+ }
}
-
&.bg-tm {
padding-left: 54rpx;
background-image: url(@/static/images/analytics/time-icon.png);
diff --git a/src/pages/index/components/feedback.vue b/src/pages/index/components/feedback.vue
index 3b3cda0a..1fcd82df 100644
--- a/src/pages/index/components/feedback.vue
+++ b/src/pages/index/components/feedback.vue
@@ -87,6 +87,10 @@
common.msg('反馈内容不能为空！')
return
}
+ if(!feedbackInfo.value.text.length > 100){
+ common.msg('反馈内容不能超过100字符！')
+ return
+ }
// todo 待接口
const params = JSON.parse(JSON.stringify({
askId: answerData.value.seqNo,
diff --git a/src/pages/index/preview.vue b/src/pages/index/preview.vue
index 036bdfdf..ff9740b3 100644
--- a/src/pages/index/preview.vue
+++ b/src/pages/index/preview.vue
@@ -62,7 +62,7 @@ export default {
wv = currentWebview.children()[0]
if(!wv) return
wv.setStyle({
- top: 80
+ top: 100
})
uni.onKeyboardHeightChange(this.setHeight)
}, 1000)
@@ -73,7 +73,7 @@ export default {
//#ifdef APP-PLUS
if(!wv) return
wv.setStyle({
- top: res.height + 20
+ top: res.height + 40
})
// #endif
},
diff --git a/src/pages/sparring/components/feedback.vue b/src/pages/sparring/components/feedback.vue
index 995bfd08..c9a3b9f8 100644
--- a/src/pages/sparring/components/feedback.vue
+++ b/src/pages/sparring/components/feedback.vue
@@ -84,6 +84,10 @@
common.msg('反馈内容不能为空！')
return
}
+ if(!feedbackInfo.value.text.length > 100){
+ common.msg('反馈内容不能超过100字符！')
+ return
+ }
// todo 待接口refineId=PARTNERINFO02506403215920251024093412000000348&fbkTyp=01&fbkContent=测试
const params = JSON.parse(JSON.stringify({
traId: answerData.value.traId,
diff --git a/src/pages/sparring/tip.vue b/src/pages/sparring/tip.vue
index 123d90a8..30d0534b 100644
--- a/src/pages/sparring/tip.vue
+++ b/src/pages/sparring/tip.vue
@@ -305,7 +305,8 @@
body: {
traId: traId.value,
chaId: chaId.value,
- traTyp: talkingType.value
+ traTyp: talkingType.value,
+ execId: execId.value||''
}
});
return;
diff --git a/src/static/images/analytics/course-1.png b/src/static/images/analytics/course-1.png
new file mode 100644
index 00000000..113a6c9e
Binary files /dev/null and b/src/static/images/analytics/course-1.png differ
diff --git a/src/static/images/analytics/den-tips.png b/src/static/images/analytics/den-tips.png
new file mode 100644
index 00000000..c5e3e6ee
Binary files /dev/null and b/src/static/images/analytics/den-tips.png differ
diff --git a/src/static/images/analytics/den-tips2.png b/src/static/images/analytics/den-tips2.png
new file mode 100644
index 00000000..0882cd7d
Binary files /dev/null and b/src/static/images/analytics/den-tips2.png differ
diff --git a/src/static/images/analytics/study-1.png b/src/static/images/analytics/study-1.png
new file mode 100644
index 00000000..133fa8bf
Binary files /dev/null and b/src/static/images/analytics/study-1.png differ
diff --git a/src/static/images/analytics/study1-1.png b/src/static/images/analytics/study1-1.png
new file mode 100644
index 00000000..85fdfa7b
Binary files /dev/null and b/src/static/images/analytics/study1-1.png differ
diff --git a/src/static/images/analytics/weidu-1.png b/src/static/images/analytics/weidu-1.png
new file mode 100644
index 00000000..8bb46af0
Binary files /dev/null and b/src/static/images/analytics/weidu-1.png differ