diff --git a/src/components/j-navbar/j-navbar.vue b/src/components/j-navbar/j-navbar.vue
new file mode 100644
index 0000000..c78a8f5
--- /dev/null
+++ b/src/components/j-navbar/j-navbar.vue
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+ {{ backText || '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages.json b/src/pages.json
index 119029f..5960441 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -42,6 +42,29 @@
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
+ },
+ {
+ "path": "pages/questionBank/exclusiveExercise",
+ "style": {
+ "navigationBarTitleText": "专项练习"
+ }
+ },
+ {
+ "path": "pages/questionBank/wrongQuestion",
+ "style": {
+ "navigationBarTitleText": "错题收藏"
+ }
+ },
+ {
+ "path": "pages/questionBank/baseOperate",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },{
+ "path": "pages/questionBank/videoDetail",
+ "style": {
+ "navigationBarTitleText": "详情"
+ }
}
],
diff --git a/src/pages/index/components/Subject1.vue b/src/pages/index/components/Subject1.vue
index e8a76f4..33efa4f 100644
--- a/src/pages/index/components/Subject1.vue
+++ b/src/pages/index/components/Subject1.vue
@@ -5,7 +5,7 @@
-
+
顺序练习
0/2344
@@ -21,7 +21,7 @@
-
+
@@ -31,7 +31,7 @@
VIP课程
-
+
@@ -39,7 +39,7 @@
精简500题
-
+
@@ -61,7 +61,7 @@
考前密卷
-
+
@@ -70,7 +70,7 @@
-
+
科一精品视频课
@@ -97,15 +97,30 @@
return {}
},
methods: {
- toAnswer() {
+ toClass(){
+ uni.navigateTo({
+ url:"/pages/questionBank/baseOperate"
+ })
+ },
+ toAnswer(title) {
uni.navigateTo({
- url:"/pages/questionBank/questionBank"
+ url:"/pages/questionBank/questionBank?navTitle="+title
})
},
toExams(){
uni.navigateTo({
url:"/pages/questionBank/practiceExams"
})
+ },
+ toExclusive(){
+ uni.navigateTo({
+ url:"/pages/questionBank/exclusiveExercise"
+ })
+ },
+ toWrongList(){
+ uni.navigateTo({
+ url:"/pages/questionBank/wrongQuestion"
+ })
}
}
}
diff --git a/src/pages/index/components/Subject2.vue b/src/pages/index/components/Subject2.vue
index 18c7e22..3de3b95 100644
--- a/src/pages/index/components/Subject2.vue
+++ b/src/pages/index/components/Subject2.vue
@@ -2,32 +2,65 @@
-
-
-
-
- 顺序练习
- 0/2344
-
-
-
-
-
-
- 模拟考试
- 去考试
-
-
-
-
+
+
+
-
+
+
+
+ 科二考试项目讲解
+
+ 自动挡
+
+
+
+
+ {{item.label}}
+
+
+
+
+
+
+
+ 合肥科三真实考场
+
+ 全部8个考场
+
+
+
+
+
@@ -42,5 +75,23 @@ export default {
top: 170rpx;
padding: 0 28rpx;
}
-
+.video_box{
+ width: 100%;
+ background: #FFFFFF;
+ border-radius: 16rpx;
+ padding: 14px;
+}
+.tab_iem{
+ width: 145rpx;
+ height: 56rpx;
+ line-height: 56rpx;
+ text-align: center;
+ background: #F5F5F5;
+ border-radius: 10rpx;
+ color:#333
+ }
+.checked_tab{
+ background: linear-gradient(90deg, #11DF20 0%, #01B74F 100%);
+ color:#fff
+}
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 6f274a5..2070e32 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,10 +1,15 @@
-
+
-
+
+
+
+
+
+
@@ -13,10 +18,12 @@
import useQuestionStore from '@/jtools/store/question' //引入store
import storage from '@/jtools/storage';
import Subject1 from "./components/Subject1";
+ import Subject2 from "./components/Subject2";
export default {
- components: {Subject1},
+ components: {Subject1,Subject2},
data() {
return {
+ tIndex:0,
searchValue:'',
cityName:'',
categoryList:[{
@@ -36,8 +43,9 @@
methods:{
...mapActions(useQuestionStore, ['getQuestionList']), //映射action
//切换科目
- changeCategory(){
-
+ changeCategory(val){
+ this.tIndex=val.index
+ console.log(this.tIndex);
},
//获取全部题库
getAllQuestion(){
diff --git a/src/pages/questionBank/baseOperate.vue b/src/pages/questionBank/baseOperate.vue
new file mode 100644
index 0000000..1b5b2cb
--- /dev/null
+++ b/src/pages/questionBank/baseOperate.vue
@@ -0,0 +1,96 @@
+
+
+ 基本操作
+
+
+
+
+
+ {{item.label}}
+
+
+
+
+ 上车、下车的方法
+ 上车、下车的方法
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/questionBank/components/Question.vue b/src/pages/questionBank/components/Question.vue
index 2264d21..27aaf24 100644
--- a/src/pages/questionBank/components/Question.vue
+++ b/src/pages/questionBank/components/Question.vue
@@ -1,5 +1,5 @@
-
+
{{item.label}}
@@ -763,4 +763,7 @@ export default {
}
}
}
+.content{
+ padding-top: calc(var(--window-top) + 10px);
+}
diff --git a/src/pages/questionBank/examResult.vue b/src/pages/questionBank/examResult.vue
index 8157e1e..4da2d6c 100644
--- a/src/pages/questionBank/examResult.vue
+++ b/src/pages/questionBank/examResult.vue
@@ -1,13 +1,14 @@
-
-
+
+ 本次成绩
+
太棒了!正确率很高了!
-
+
99
未做题
@@ -24,14 +25,19 @@
-
-
+
+
考试情况
+
+ 90
+
+ 及格线
+
@@ -49,15 +55,24 @@
//您可以通过修改 config-ucharts.js 文件中下标为 ['line'] 的节点来配置全局默认参数,如都是默认参数,此处可以不传 opts 。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式,达到页面简洁的需求。
opts: {
color: ["#FAC858"],
- padding: [15, 10, 0, 15],
+ padding: [10, 5 ,5,5],
enableScroll: false,
legend: {},
xAxis: {
+ disabled:true,
disableGrid: true
},
- yAxis: {
+ yAxis:{
+ data:[{
gridType: "dash",
- dashLength: 2
+ position: 'left',
+ dashLength: 2,
+ max:100,
+ min:0,
+ }]
+ },
+ legend:{
+ show:false
},
extra: {
line: {
@@ -78,9 +93,10 @@
setTimeout(() => {
//模拟服务器返回数据,如果数据格式和标准格式不同,需自行按下面的格式拼接
let res = {
- categories: [],
+ categories: ["2018","2019","2020","2021","2022","2023"],
series: [{
- data: [32]
+ name: "",
+ data: [90]
},
]
};
@@ -111,9 +127,14 @@
.charts-box {
width: 100%;
- height: 346rpx;
+ height: 400rpx;
background-color: #fdfdfd;
border-radius: 20rpx;
- ppadding-top: 20rpx;
+ padding-top: 20rpx;
+ }
+ .xian{
+ width: 565rpx;
+ height: 0rpx;
+ border-top: 1px dashed #CCCCCC;
}
diff --git a/src/pages/questionBank/exclusiveExercise.vue b/src/pages/questionBank/exclusiveExercise.vue
new file mode 100644
index 0000000..3d468af
--- /dev/null
+++ b/src/pages/questionBank/exclusiveExercise.vue
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+ 图表技巧
+ 快速记忆
+
+
+
+
+
+ 章节练习
+ 共5章
+
+
+
+
+
+
+
+
+
+ {{listItem.title}}
+ {{listItem.subTitle}}
+
+
+
+
+ 常见考点
+
+
+ {{index+1}}
+ {{item.label}}
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/questionBank/practiceExams.vue b/src/pages/questionBank/practiceExams.vue
index 80a1f59..76a1afb 100644
--- a/src/pages/questionBank/practiceExams.vue
+++ b/src/pages/questionBank/practiceExams.vue
@@ -1,7 +1,8 @@
-
-
+
+ 模拟考试
diff --git a/src/pages/questionBank/practiceResult.vue b/src/pages/questionBank/practiceResult.vue
index 73a1ed4..f3ad074 100644
--- a/src/pages/questionBank/practiceResult.vue
+++ b/src/pages/questionBank/practiceResult.vue
@@ -1,10 +1,11 @@
-
-
+
+ 本次练题结果
+
-
+
太棒了!正确率很高了!
diff --git a/src/pages/questionBank/questionBank.vue b/src/pages/questionBank/questionBank.vue
index bc360f3..02f524a 100644
--- a/src/pages/questionBank/questionBank.vue
+++ b/src/pages/questionBank/questionBank.vue
@@ -1,7 +1,8 @@
-
-
+
+ {{navTitle}}
@@ -19,6 +20,7 @@
},
data() {
return {
+ navTitle:'',
tabsList:[{
label:"答题",
value:0
@@ -28,8 +30,10 @@
}]
}
},
- onLoad() {
- console.log(this.orderQuestionList);
+ onLoad(op) {
+ if(op&&op.navTitle){
+ this.navTitle=op.navTitle
+ }
},
computed: {
...mapState(useQuestionStore, ["orderQuestionList"]) //映射函数,取出tagslist
diff --git a/src/pages/questionBank/videoDetail.vue b/src/pages/questionBank/videoDetail.vue
new file mode 100644
index 0000000..10381cc
--- /dev/null
+++ b/src/pages/questionBank/videoDetail.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
+ C1捷达-基础操作视频讲解
+
+ 更多
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/questionBank/wrongQuestion.vue b/src/pages/questionBank/wrongQuestion.vue
new file mode 100644
index 0000000..76a225f
--- /dev/null
+++ b/src/pages/questionBank/wrongQuestion.vue
@@ -0,0 +1,195 @@
+
+
+
+
+
+
+
+
+
+
+ {{title}}
+
+
+
+
+ {{tIndex==0?'错题':'收藏'}}情况
+
+
+
+ 4
+
+
+
+
+
+
+
+ 全部{{tIndex==0?'错题':'收藏'}}
+
+
+ 错4/已做100
+
+
+
+
+
+
+ 32%错题率
+ 错题率有点高,快去提升吧
+
+
+
+
+
+
+
+ 答对后自动移除错题
+
+
+
+
+
+
+ 科一精品视频课
+ 全部10节课 >
+
+
+
+
+
+
+ 科一易错试题
+
+
+
+
+
+
+
+
+
+ {{tIndex==0?'错题':'收藏题'}}分类
+
+
+
+
+ {{item.typeName}}
+ {{item.typeNum}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/static/image/practice/chapter_bg.png b/src/static/image/practice/chapter_bg.png
new file mode 100644
index 0000000..87fb940
Binary files /dev/null and b/src/static/image/practice/chapter_bg.png differ
diff --git a/src/static/image/practice/error_icon.png b/src/static/image/practice/error_icon.png
new file mode 100644
index 0000000..d0bfd9f
Binary files /dev/null and b/src/static/image/practice/error_icon.png differ
diff --git a/src/static/image/practice/errorprone_bg.png b/src/static/image/practice/errorprone_bg.png
new file mode 100644
index 0000000..abd0cce
Binary files /dev/null and b/src/static/image/practice/errorprone_bg.png differ
diff --git a/src/static/image/practice/neverWrite_icon.png b/src/static/image/practice/neverWrite_icon.png
new file mode 100644
index 0000000..10829ac
Binary files /dev/null and b/src/static/image/practice/neverWrite_icon.png differ
diff --git a/src/static/image/practice/newRules_icon.png b/src/static/image/practice/newRules_icon.png
new file mode 100644
index 0000000..75267f4
Binary files /dev/null and b/src/static/image/practice/newRules_icon.png differ