diff --git a/.env.development b/.env.development
index edad90b1..688a03e6 100644
--- a/.env.development
+++ b/.env.development
@@ -1,50 +1,6 @@
# 开发环境
ENV = 'development'
# 'development'
+
VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
-# UAT
-# VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786'
-
-# DEV
-
-# app入口
-
-
-# VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
-# VITE_APP_BASE_API_Url = 'http://25.16.122.92:9786'
-# VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
-
-# h5专用地址x2
-
-# VITE_APP_BASE_H5_API_Url = 'http://25.16.122.65:7001'
-# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.21:9786'
-
-
-# VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001'
-
-
-# dev
-VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
-# sit
-# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786'
-
-# UAT
-# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
-
-# 任东
-VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601'
-VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
-
-# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604'
-# 张建成
-# VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
-# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.144:9602'
-# 王洋洋
-# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604'
-# 于嘉文
-# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.143:9604'
-# 孙宇
-# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.139:9604'
-# 付丙鑫
-# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.145:9602'
diff --git a/certificate/ios/jiaixuedev.mobileprovision b/certificate/ios/jiaixuedev.mobileprovision
index f72974ab..f77c4ce3 100644
Binary files a/certificate/ios/jiaixuedev.mobileprovision and b/certificate/ios/jiaixuedev.mobileprovision differ
diff --git a/src/App.vue b/src/App.vue
index a95c6e00..836567cb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,4 @@
-
diff --git a/src/components/watermark/watermark.vue b/src/components/watermark/watermark.vue
new file mode 100644
index 00000000..c5071a8c
--- /dev/null
+++ b/src/components/watermark/watermark.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+ {{ textValue }}
+
+
+
+
+
+
+
+
+
diff --git a/src/composables/useExamSubject.js b/src/composables/useExamSubject.js
new file mode 100644
index 00000000..eff364d6
--- /dev/null
+++ b/src/composables/useExamSubject.js
@@ -0,0 +1,10 @@
+import RecordPermission from '@/common/recordPermission.js'
+
+export const initRecord = () => RecordPermission.requestPermission();
+
+
+export default function useIndexList() {
+ return {
+
+ };
+}
\ No newline at end of file
diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue
index f62c2ddb..f07f397f 100644
--- a/src/pages/course/components/touchBtn.vue
+++ b/src/pages/course/components/touchBtn.vue
@@ -1,22 +1,54 @@
- 按住说话
+
+ 按住说话
-
-
+
-
-
-
+
+
+
-
+
@@ -25,42 +57,30 @@
松开发送
- 取消
+
+ 取消
-
+
-
\ No newline at end of file
+
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index 47fe4136..6e2ade92 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -1,1065 +1,1121 @@
-
-
-
-
-
-
-
- AI问答
-
-
-
-
- 历史
- 消息
- 我的
-
-
-
+
+
+
+
+
+
+
+
+
+ AI问答
+
+
+
+
+ 历史
+ 消息
+ 我的
+
+
+
-
-
-
-
-
- {{ userInfo ? 'Hi,我是' + userInfo?.mascotInfo?.mascotName : 'Hi' }}
- 工作学习,我都能帮你!
- 试试他的能力
-
-
-
-
-
-
- {{ questionList[item - 1].hotContent }}
-
-
-
-
- {{ questionList[item + Math.ceil(questionList.length / 2) - 1].hotContent }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ 'AI学' }}
-
-
-
- {{ 'AI练' }}
-
-
-
- {{ 'AI考' }}
-
-
-
- {{ '去PK' }}
-
-
-
- {{ '任务' }}
-
-
-
- {{ '错题' }}
-
-
-
- {{ '分析' }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ userInfo ? 'Hi,我是' + userInfo?.mascotInfo?.mascotName : 'Hi' }}
+ 工作学习,我都能帮你!
+ 试试他的能力
+
+
+
+
+
+
+ {{ questionList[item - 1].hotContent }}
+
+
+
+
+ {{ questionList[item + Math.ceil(questionList.length / 2) - 1].hotContent }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'AI学' }}
+
+
+
+ {{ 'AI练' }}
+
+
+
+ {{ 'AI考' }}
+
+
+
+ {{ '去PK' }}
+
+
+
+ {{ '任务' }}
+
+
+
+ {{ '错题' }}
+
+
+
+ {{ '分析' }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/learningTasks/details.vue b/src/pages/learningTasks/details.vue
index 67096ef6..fec14df0 100644
--- a/src/pages/learningTasks/details.vue
+++ b/src/pages/learningTasks/details.vue
@@ -508,19 +508,21 @@
}
.body-title {
+
+
width: 100%;
position: relative;
text-align: center;
- height: 160rpx;
+ height: 180rpx;
padding-top: var(--status-bar-height);
- margin-bottom: -20rpx;
- line-height: calc(160rpx - var(--status-bar-height) - 20rpx);
+ margin-bottom: -10rpx;
+ line-height: calc(180rpx - var(--status-bar-height) - 10rpx);
font-family: PingFangSC;
font-weight: 600;
font-size: 32rpx;
color: #000000;
font-style: normal;
-
+
background-image: url('@/static/images/learningTasks/learningTasksBg.png');
background-repeat: no-repeat;
background-size: 100% calc(420rpx + var(--status-bar-height)); /* 宽度充满,高度自适应比例 */
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index a5034b55..031da385 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -1,6 +1,5 @@
-
@@ -14,7 +13,7 @@
class="img_100"
:src="user_info.imageAddr"
>
-
+
@@ -145,7 +144,6 @@
-
-
diff --git a/src/pages/practice/index.vue b/src/pages/practice/index.vue
index 3441542b..d659c1f4 100644
--- a/src/pages/practice/index.vue
+++ b/src/pages/practice/index.vue
@@ -81,7 +81,7 @@