Skip to content

S
self-support
Commit fc124ce9 authored by 刘用法's avatar 刘用法
Browse files
Options

Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

parents ab54fea9 50074060
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 10 deletions
src/pages/index/learn.vue
View file @ fc124ce9
......@@ -4,8 +4,9 @@
<text class="title-view">学习</text>
</u-navbar>
<image :src="bannerImage" mode="" class="banner"></image>
<u-tabs-swiper bg-color="#F4F5F7" inactive-color="#999999" font-size="28" ref="uTabs" :list="tabs" :current="current" @change="tabsChange" :is-scroll="false" :bar-width="52" swiperWidth="750"></u-tabs-swiper>
<swiper class="swiper_group" :current="swiperCurrent" @animationfinish="animationfinish">
<u-tabs-swiper bg-color="#F4F5F7" inactive-color="#999999" font-size="28" ref="uTabs" :list="tabs"
:current="current" @change="tabsChange" :is-scroll="false" :bar-width="52" swiperWidth="750"></u-tabs-swiper>
<swiper class="swiper_group" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
<swiper-item @touchmove.stop.prevent="stopTouchMove" v-show="current == 0">
<scroll-view scroll-y style="height:100%;width:100%;">
<view class="jf-currency-class">
......@@ -22,7 +23,7 @@
</scroll-view>
</swiper-item>
<swiper-item @touchmove.stop.prevent="stopTouchMove" v-show="current == 1">
<scroll-view scroll-y style="height:100%;width:100%;" @scrolltolower="onReachBottom" scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100" @refresherpulling="onPulling" @refresherrefresh="onRefresh" @refresherrestore="onRestore" @refresherabort="onAbort">
<scroll-view scroll-y style="height:100%;width:100%;" @scrolltolower="onreachBottom" scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100" @refresherpulling="onPulling" @refresherrefresh="onRefresh" @refresherrestore="onRestore" @refresherabort="onAbort">
<view v-for="item in list" :key="item.id" class="notice" @click="bbb(item)">
<view class="n-head">
{{item.title}}
......@@ -246,6 +247,7 @@ var examJson = {
examId: "",
examStatus: "",
isComplete: false,
questionTime: null,
},
{
title: "接单操作",
......@@ -257,6 +259,7 @@ var examJson = {
examId: "",
examStatus: "",
isComplete: false,
questionTime: null,
},
],
test: [
......@@ -269,6 +272,7 @@ var examJson = {
id: 3,
examId: "",
examStatus: "",
questionTime: null,
isComplete: false,
},
{
......@@ -280,6 +284,7 @@ var examJson = {
id: 4,
examId: "",
examStatus: "",
questionTime: null,
isComplete: false,
},
],
......@@ -294,6 +299,7 @@ var examJson = {
examId: "",
examStatus: "",
isComplete: false,
questionTime: null,
},
{
title: "接单操作",
......@@ -305,6 +311,7 @@ var examJson = {
examId: "",
examStatus: "",
isComplete: false,
questionTime: null,
},
],
};
......@@ -379,6 +386,7 @@ export default {
examId: examListJson[0].examId,
examStatus: examListJson[0].examStatus,
isComplete: examListJson[0].isComplete,
questionTime: examListJson[0].questionTime,
},
{
title: examListJson[1].title,
......@@ -390,6 +398,7 @@ export default {
examId: examListJson[1].examId,
examStatus: examListJson[1].examStatus,
isComplete: examListJson[1].isComplete,
questionTime: examListJson[1].questionTime,
},
],
loadStatus: "loading",
......@@ -447,8 +456,13 @@ export default {
onAbort() {
console.log("onAbort");
},
transition(e) {
// swiper-item左右移动，通知tabs的滑块跟随移动
let dx = e.detail.dx;
this.$refs.uTabs.setDx(dx);
},
//scroll-view到底部加载更多
onReachBottom() {
onreachBottom() {
//上拉触底函数
if (!this.isLoadMore) {
this.isLoadMore = true;
......@@ -635,6 +649,11 @@ export default {
}
this.examList[i].examId = res.data.id;
this.examList[i].examStatus = res.data.examStatus; //i;//
this.examList[i].questionTime = res.data.questionTime;
console.log(
this.examList[i].questionTime,
"每题考试时间"
);
let examResult = res.data.examLevelResult;
this.examList[i].status =
examResult != "" ? examResult : "未通过";
......@@ -671,6 +690,9 @@ export default {
aaa(index) {
//examStatus 用户考试状态 0考试中 1考试完成 2未参与
//考试完成分成通过、未通过
getApp().globalData.questionTime = this.examList[
index
].questionTime;
var examInfo = this.examList[index];
if (examInfo.examStatus == 0) {
console.log("这是试卷id", examInfo.id);
......
src/pages/learn/answer.vue
View file @ fc124ce9
......@@ -74,8 +74,8 @@ export default {
isSelect: false,
timeDefine: {
"time-id-2": 1800,
"time-id-3": 900,
"time-id-4": 450,
"time-id-3": getApp().globalData.questionTime * 5,
"time-id-4": getApp().globalData.questionTime * 5,
},
endTime: 0,
currentTime: 100,
......@@ -130,6 +130,7 @@ export default {
if (h !== "00") res += `${h}:`;
if (m !== "00") res += `${m}:`;
res += `${s}`;
if (this.endTime == 0) res = "00:00";
return res;
},
toSubmit() {
......@@ -353,13 +354,20 @@ export default {
}
if (res.data.code == 200) {
that.currentItem = res.data.data;
console.log(that.currentItem);
that.progress = res.data.data.progress;
if (res.data.data.isQuestion) {
let str = res.data.data.question.content;
var wz = str.indexOf(".");
let str1 = str.substring(wz + 1);
console.log(that.currentItem);
that.currentItem.question.content = str1;
console.log(str1, "切割的字符串");
}
if (res.data.data.answerList) {
that.handleData();
// that.currentTime = 100
this.everyTime = 90; //每道题90s
this.everyTime = getApp().globalData.questionTime; //每道题100s
that.isSelect = false;
clearTimeout(this.timer);
that.startCounting();
......
src/pages/learn/section.vue
View file @ fc124ce9
......@@ -228,6 +228,7 @@
this.courseDesc = res.data.content.replace(/<p.*?>|<\/p>/ig, "")
this.section_id = res.data.id
this.section_content = res.data.content
this.status = res.data.isLearned ? 1 : 0
this.teacher.name = res.data.teachers[0].name
this.teacherImage = res.data.teachers[0].avatar
this.teacherIntro = res.data.teachers[0].intro.replace(/<.*?>|<\/.*?>/ig, "")
......@@ -456,7 +457,6 @@
// padding: 20rpx;
padding-left: 20rpx;
background: #fff;
white-space: nowrap;
// border: 1px solid red;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment