huxiaofeng666
/
jwl-applet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'dev-hxf' (#6) from dev-hxf into master

Browse Source 
Reviewed-on: #6
pull/7/head
huxiaofeng666 1 year ago
parent 1f6080aa01 90ffd2e4ff
commit d74abad722
11 changed files with 173 additions and 13 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      src/pages.json
  2. 18
      src/pages/index/iconSkill.vue
  3. 1
      src/pages/index/videoVip.vue
  4. 42
      src/pages/questionBank/chapterExercise.vue
  5. 83
      src/pages/questionBank/components/Question.vue
  6. 16
      src/pages/questionBank/exclusiveExercise.vue
  7. 10
      src/pages/questionBank/questionBank.vue
  8. BIN
      src/static/image/practice/vip_bg.png
  9. BIN
      src/static/image/practice/vip_include.png
  10. BIN
      src/static/image/practice/vip_question.png
  11. BIN
      src/static/image/practice/vip_test.png

16
src/pages.json
Unescape View File

@ -110,7 +110,21 @@
"navigationBarTitleText": "登录",
"enablePullDownRefresh": false
}
}
},
{
"path": "pages/index/iconSkill",
"style": {
"navigationBarTitleText": "图标技巧",
"enablePullDownRefresh": false
}
},
{
"path": "pages/questionBank/chapterExercise",
"style": {
"navigationBarTitleText": "章节练习",
"enablePullDownRefresh": false
}
}
],
"globalStyle": {

18
src/pages/index/iconSkill.vue
Unescape View File

@ -0,0 +1,18 @@
<template>
<view>
<web-view :src="webviewPath"></web-view>
</view>
</template>
<script>
export default {
data() {
return{
webviewPath:'https://jtbz.ahduima.com/index'
}
}
}
</script>
<style>
</style>

1
src/pages/index/videoVip.vue
Unescape View File

@ -104,6 +104,7 @@
width: 218rpx;
border-radius: 0 0 16rpx 12rpx;
background-color: #FF6E02;
color:#fff
}
.tag{
width: 122rpx;

42
src/pages/questionBank/chapterExercise.vue
Unescape View File

@ -0,0 +1,42 @@
<template>
<view>
<view class="chapter_item p14" v-for="(item,index) of chapterList" :key="index" @tap="toQuestion">
{{item.label}}
</view>
</view>
</template>
<script>
export default {
data() {
return {
chapterList:[
{label:'驾驶证申请相关'},
{label:'驾驶证申请相关'},
{label:'驾驶证登记处罚'},
{label:'机动车强制报废'},
{label:'其他考点'},
{label:'驾驶证登记处罚'},
{label:'机动车强制报废'},
{label:'其他考点'}]
}
},
methods:{
toQuestion(){
uni.navigateTo({
url:"/pages/questionBank/questionBank?navTitle="+章节技巧
})
}
}
}
</script>
<style scoped>
.chapter_item{
border-bottom: 1px solid rgb(210,209,214);
background-color: #fff;
}
.chapter_item:hover{
background-color: rgb(210,209,214);
}
</style>

83
src/pages/questionBank/components/Question.vue
Unescape View File

@ -39,7 +39,7 @@
</scroll-view>
</swiper-item>
</swiper>
<view class="wp100 flex jc-sb ai-c p14 bc-fff" style="position: fixed;bottom: 0;left: 0;">
<view class="wp100 flex jc-sb ai-c p14 bc-fff" v-if="isShowAll" style="position: fixed;bottom: 0;left: 0;">
<view style="width: 220rpx;">
<button v-if="type==='practice'" class="btn">四步学科一</button>
<view v-else class="btn" style="text-align: center;" @tap="submitPaper">
@ -65,6 +65,9 @@
<text class="cor-666">题板</text>
</view>
</view>
<view v-else class="wp100 p14" style="position: fixed;bottom: 30rpx;left: 0;">
<button class="vip_btn" @click="toVip">立即查看全部题目</button>
</view>
<u-modal :show="tipShow">
<view class="relative wp100">
<view class="text-center">
@ -149,10 +152,41 @@
</view>
</view>
</u-popup>
</view>
<u-popup :show="showVip" mode="bottom" :closeOnClickOverlay="true" :round="16" @close="showVip=false">
<view class="p14" style="z-index: 9;">
<view class="wp100 flex ai-c jc-sb">
<text class="fs30 fw600 cor-000">VIP题库</text>
<u-icon name="close" color="#c2c2c2" size="20" @tap="showVip=false"></u-icon>
</view>
<text class="fs16 cor-666">精准刷题，更高效</text>
<view style="width:100%;height: 110rpx;background-image: url(../../static/image/practice/vip_question.png);background-size: 100% 100%;" class="mt15 relative">
<view style="position: absolute;left:0,top:0;height: 110rpx;" class="wp100 flex jc-c ai-c">
<text class="fs16" style="color: #994800;">科一+科四精简500题</text>
</view>
<image style="width: 65rpx;height: 65rpx; position: absolute;right: 20px;top: -5px;" src="../../static/image/practice/vip_include.png"></image>
</view>
<view style="width:100%;height: 110rpx;background-image: url(../../static/image/practice/vip_test.png);background-size: 100% 100%;z-index: 9;" class="mt15 relative">
<view style="position: absolute;left:0,top:0;height: 110rpx;" class="wp100 flex jc-c ai-c">
<text class="fs16" style="color: #994800;">科一+科四考前密卷2套</text>
</view>
<image style="width: 65rpx;height: 65rpx; position: absolute;right: 20px;top: -5px;" src="../../static/image/practice/vip_include.png"></image>
</view>
</view>
<view style="height: 528rpx;width: 100%;background-image: url(../../static/image/practice/vip_bg.png);background-size: 100% 100%;margin-top: -65px;position: relative;">
<text style="position: absolute;top: 138px;left:100px;rotate: 16deg;" class="fs25 cor-fff">VIP题库</text>
</view>
<view class="wp100 p14" style="position: absolute;left: 0;bottom:20px">
<view class="sub_btn flex ai-c jc-sb">
<text class="cor-fff fs14">¥<text class="fs24 cor-fff">{{nowPrice}}</text></text>
<image style="width: 276rpx;height: 88rpx;margin-top: -5px;" src="../../static/image/index/buy.png"></image>
</view>
</view>
</u-popup>
</view>
</template>
<script>
import storage from '@/jtools/storage';
export default {
props:{
tabsList:{
@ -165,10 +199,16 @@ export default {
isSubmit:{
type:Boolean,
default:false
},
isShowAll:{
type:Boolean,
default:true
}
},
data() {
return {
nowPrice:68,
showVip:false,
popupShow:false,
content:'太棒啦，已答完最后一题~',
tipShow:false,
@ -178,6 +218,7 @@ export default {
qIndex:0,
rightList:[],
wrongList:[],
collectList:storage.get('collectList') || [],
questionList: [],//数据源
swiperList: [], // 轮播图数据列表
swiperIndex: 0, // 轮播图当前位置
@ -191,6 +232,10 @@ export default {
this.renderSwiper(0)
},
methods: {
//开通VIP
toVip(){
this.showVip=true
},
submitPaper(){
this.$refs.countDown_1.pause();
this.$refs.countDown_2.pause();
@ -222,18 +267,24 @@ export default {
},
toCollect(){
if(this.questionList[this.topicIndex].isCollect){
if(this.collectList.includes(this.questionList[this.topicIndex].questionId)){
const idx=this.collectList.indexOf(this.questionList[this.topicIndex].questionId)
this.collectList.splice(idx,1)
}
this.questionList[this.topicIndex].isCollect=false
uni.showToast({
title:"取消收藏",
icon:'none'
})
}else{
this.collectList.push(this.questionList[this.topicIndex].questionId)
this.questionList[this.topicIndex].isCollect=true
uni.showToast({
title:"已收藏",
icon:'none'
})
}
storage.set('collectList',this.collectList)
},
cancel(){
this.tipShow=false
@ -292,8 +343,13 @@ export default {
// 轮播图动画结束
onAnimationfinish(e) {
if(this.index>=this.questionList.length){
this.tipShow=true
if(this.isShowAll){
this.tipShow=true
}else{
this.showVip=true
}
}else{
this.showVip=false
this.tipShow=false
}
if (!this.isChange) return;
@ -321,7 +377,7 @@ export default {
}
console.log(this.rightList);
if(this.wrongList.includes(this.questionList[this.topicIndex].questionId)){
const wIndex=this.wrongList.findIndex(this.questionList[this.topicIndex].questionId)
const wIndex=this.wrongList.indexOf(this.questionList[this.topicIndex].questionId)
this.wrongList.splice(wIndex,1)
}
if(this.topicIndex<this.questionList.length-1){
@ -766,4 +822,23 @@ export default {
.content{
padding-top: calc(var(--window-top) + 10px);
}
.vip_btn{
width:100%;
height: 100rpx;
line-height: 100rpx;
text-align: center;
font-size: 18px;
color:#fff;
background: linear-gradient(90deg, #FF9804 0%, #E95B0E 100%);
border-radius: 50rpx;
}
.sub_btn{
width:100%;
height: 110rpx;
border: 4px solid #F59B26;
background: linear-gradient(0deg, #E66501 0%, #F8A42C 100%);
box-shadow: 0rpx 16rpx 20rpx 1rpx rgba(245,155,38,0.78);
border-radius: 55rpx;
padding: 14rpx;
}
</style>

16
src/pages/questionBank/exclusiveExercise.vue
Unescape View File

@ -1,15 +1,15 @@
<template>
<view class="p14">
<view class="flex jc-sb">
<view class="relative mr5">
<view class="relative mr5" @tap="toIconSkill">
<image style="width: 336rpx;height: 152rpx;" src="../../static/image/practice/errorprone_bg.png">
</image>
<view style="position: absolute;left: 0;top: 0;" class="p10">
<view style="color: #04B13B;font-size: 18px;">图表技巧</view>
<view style="color: #04B13B;font-size: 18px;">图标技巧</view>
<text style="color: #04B13B;font-size: 14px;">快速记忆</text>
</view>
</view>
<view class="relative ml5">
<view class="relative ml5" @tap="toChapterSkill">
<image style="width: 363rpx;height: 170rpx;" src="../../static/image/practice/chapter_bg.png"></image>
<view style="position: absolute;left: 0;top: 0;" class="p10">
<view style="color: #FF6E02;font-size: 18px;">章节练习</view>
@ -92,6 +92,16 @@
url:"/pages/questionBank/questionBank?navTitle="+title
})
},
toIconSkill(){
uni.navigateTo({
url:"/pages/index/iconSkill"
})
},
toChapterSkill(){
uni.navigateTo({
url:"/pages/questionBank/chapterExercise"
})
}
}
}
</script>

10
src/pages/questionBank/questionBank.vue
Unescape View File

@ -3,9 +3,9 @@
<!-- <u-navbar :title="navTitle" @rightClick="rightClick" :autoBack="true">
</u-navbar> -->
<j-navbar>{{navTitle}}</j-navbar>
<Question :tabsList="tabsList" />
</view>
</template>
<Question :tabsList="tabsList" :isShowAll="true" />
</view>
</template>
<script>
import {
@ -41,11 +41,11 @@
methods: {
rightClick() {
console.log('返回');
}
},
}
}
</script>
<style>
<style scoped>
</style>

BIN
src/static/image/practice/vip_bg.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 MiB

BIN
src/static/image/practice/vip_include.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
src/static/image/practice/vip_question.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 51 KiB

BIN
src/static/image/practice/vip_test.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 53 KiB

Write Preview
Loading…
Cancel
Save