diff --git a/.env.development b/.env.development
index c27d2b64..c596220c 100644
--- a/.env.development
+++ b/.env.development
@@ -13,7 +13,7 @@ ENV = 'development'
# DEV
VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
-# http://25.18.122.65:7001/download/dev-jax.apk
+
# app入口
#VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
#VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786'
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 8ae452a8..e4668703 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -4,6 +4,10 @@
{
"playground" : "standard",
"type" : "uni-app:app-android"
+ },
+ {
+ "playground" : "standard",
+ "type" : "uni-app:app-ios"
}
]
}
diff --git a/README.en.md b/README.en.md
index 5450375b..85462a72 100644
--- a/README.en.md
+++ b/README.en.md
@@ -1 +1,5 @@
-npm i --registry=http://25.12.10.69:8081/repository/aliyun-npm/
\ No newline at end of file
+npm install --registry=http://25.12.10.69:8081/repository/aliyun-npm/
+
+npm 淘宝源下载 :npm config set registry https://registry.npmmirror.com
+
+npm config set registry http://25.12.10.69:8081/repository/aliyun-npm/
\ No newline at end of file
diff --git a/package.json b/package.json
index 8b55ed63..7dc69841 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,8 @@
"@dcloudio/uni-quickapp-webview": "3.0.0-4060620250520001",
"crypto-js": "^3.1.9-1",
"markdown-it": "^14.1.0",
+ "markdown-it-attrs": "^4.3.1",
+ "markdown-it-highlightjs": "^4.2.0",
"pinia": "^2.3.1",
"terser": "^5.42.0",
"uuid": "^11.1.0",
diff --git a/src/components/image-preview/image-preview.vue b/src/components/image-preview/image-preview.vue
index c281727d..8e766627 100644
--- a/src/components/image-preview/image-preview.vue
+++ b/src/components/image-preview/image-preview.vue
@@ -64,6 +64,10 @@
watch: {
imgId: {
handler(newval, oldval) {
+ if(newval.indexOf('/') === 0) {
+ this.imgUrlShow = this.base_url + newval
+ return
+ }
if(newval.indexOf('http') === 0){
this.imgUrlShow = newval
return
@@ -128,7 +132,9 @@
},
mounted() {
if (this.imgId) {
- if(this.imgId.indexOf('http') === 0){
+ if(this.imgId.indexOf('/') === 0) {
+ this.imgUrlShow = this.base_url + this.imgId
+ }else if(this.imgId.indexOf('http') === 0){
this.imgUrlShow = this.imgId
}else{
this.getPreviewUrlBlob(this.imgId);
diff --git a/src/components/markdown-preview/markdown-preview.vue b/src/components/markdown-preview/markdown-preview.vue
index df00d1ad..b57ce8f6 100644
--- a/src/components/markdown-preview/markdown-preview.vue
+++ b/src/components/markdown-preview/markdown-preview.vue
@@ -7,42 +7,13 @@
-
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 4cd6d89d..5ffa6f61 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -162,7 +162,7 @@
},
{
"text": "学习",
- "pagePath": "pages/study/index"
+ "pagePath": "pages/course/index"
},
{
"text": "场景",
@@ -198,15 +198,5 @@
"bounce": "none"
}
},
- "uniIdRouter": {},
- "condition" : { //模式配置,仅开发期间生效
- "current": 0, //当前激活的模式(list 的索引项)
- "list": [
- {
- "name": "", //模式名称
- "path": "", //启动页面,必选
- "query": "" //启动参数,在页面的onLoad函数里面得到
- }
- ]
- }
+ "uniIdRouter": {}
}
\ No newline at end of file
diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index 5e5a3430..43b5ec4e 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -147,8 +147,13 @@
>
文
- 完成
- 撤回
+ 完成
+ 撤回
+
diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue
index e6c25f2f..9bc227b7 100644
--- a/src/pages/course/components/touchBtn.vue
+++ b/src/pages/course/components/touchBtn.vue
@@ -38,7 +38,7 @@
diff --git a/src/pages/index/components/answer.vue b/src/pages/index/components/answer.vue
index f63c3005..2c8c3905 100644
--- a/src/pages/index/components/answer.vue
+++ b/src/pages/index/components/answer.vue
@@ -1,9 +1,19 @@
- 答案
+
+
+
-
-
\ No newline at end of file
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index 36d0ee0c..9a773039 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -3,7 +3,7 @@
-
+
设置
@@ -84,7 +84,7 @@
@startRecord="startRecordCallback"
:isDisabled="false"
/>
-
+
@@ -92,7 +92,6 @@
import { ref } from 'vue'
import common from '@/common/common';
import TouchBtn from '@/pages/course/components/touchBtn.vue'
- import MarkdownPreview from '@/components/markdown-preview/markdown-preview.vue';
import TalkingItem from './components/talking-item.vue';
const questionList = ref([
'对公小程序开户流程?',
@@ -126,14 +125,16 @@
const routerTo = (type) => {
switch(type){
case 'AI学':
- common.navigateTo('/pages/course/index')
+ common.switchTab('/pages/course/index')
break;
default:
common.msg('页面建设中,敬请期待!')
break;
}
}
-
+ const scrolltolower = () => {
+ common.switchTab('/pages/index/index')
+ }
const uploadRecordNow = (voicePath) => {
}
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index e901fc62..2d55fb31 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -14,9 +14,7 @@
消息
-
- 30
-
+ 30
@@ -80,7 +78,7 @@
-
+
课程中心
@@ -131,7 +129,7 @@
-
+
{{item.crsName}}
@@ -164,7 +162,7 @@
-
+
{{item.crsName}}
@@ -196,7 +194,7 @@
-
+
{{item.crsName}}
@@ -383,7 +381,7 @@
width: 146rpx !important;
border-radius: 16rpx;
}
-
+
// 底线样式
.bottom_line {
margin: 0 auto;
@@ -495,7 +493,7 @@
position: absolute;
top: 0;
left: 0;
- width: 100%;
+ width: calc(100% + 4rpx);
height: 870rpx;
z-index: -1;
}
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index 502d656e..9269b5c7 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -74,7 +74,7 @@
考试记录
-
+
我的报告
@@ -91,7 +91,7 @@
-
+
@@ -192,16 +192,18 @@
imageAddr: '',
});
const goTest = () => {
- const now = Date.now();
- if (now - lastClickTime.value > 500) {
- clickCount.value = 0;
- }
- clickCount.value++;
- lastClickTime.value = now;
- if (clickCount.value == 6) {
- common.navigateTo('/pages/test/index');
- clickCount.value = 0;
- }
+ console.log('goTest');
+ common.navigateTo('/pages/test/index');
+ // const now = Date.now();
+ // if (now - lastClickTime.value > 500) {
+ // clickCount.value = 0;
+ // }
+ // clickCount.value++;
+ // lastClickTime.value = now;
+ // if (clickCount.value == 6) {
+ // common.navigateTo('/pages/test/index');
+ // clickCount.value = 0;
+ // }
};
diff --git a/src/pages/test/index.vue b/src/pages/test/index.vue
index 644f6292..32432e94 100644
--- a/src/pages/test/index.vue
+++ b/src/pages/test/index.vue
@@ -24,6 +24,7 @@ import { get_base_url } from '../../api/request';
const url = get_base_url();
const ENV = import.meta.env
const appBaseInfo = uni.getAppBaseInfo()
+console.log('appBaseInfo', appBaseInfo);