Commit 05c4f81f authored by Facius's avatar Facius

Merge branch 'dev-v1.0.0' of https://git.banshouhui.com/wuzhenzhe/study into dev-v1.0.0

parents 9250e161 71f25dcf
...@@ -215,7 +215,7 @@ export default { ...@@ -215,7 +215,7 @@ export default {
} }
}, },
onLoad(e) { onLoad(e) {
if (e?.experience) this.experience = Boolean(e.experience) // 体验资格 if (e?.experience) this.experience = JSON.parse(e.experience) // 体验资格
if (e?.daily) this.daily.status = true // 每日一练 if (e?.daily) this.daily.status = true // 每日一练
if (e?.dailyCount) this.daily.count = parseInt(e.dailyCount) // 打卡天数 if (e?.dailyCount) this.daily.count = parseInt(e.dailyCount) // 打卡天数
if (e?.source) this.source = parseInt(e.source) // 来源 if (e?.source) this.source = parseInt(e.source) // 来源
...@@ -488,7 +488,7 @@ export default { ...@@ -488,7 +488,7 @@ export default {
uni.hideLoading() uni.hideLoading()
if (res) { // 交卷 if (res) { // 交卷
this.$u.route({ this.$u.route({
type: 'redirect', type: 'reLaunch',
url: '/pages/learn/score', url: '/pages/learn/score',
params: { params: {
id: this.recordId id: this.recordId
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
titleColor="#191C27" titleColor="#191C27"
:border-bottom="false" :border-bottom="false"
title-bold title-bold
:custom-back="customBack"
></u-navbar> ></u-navbar>
<view <view
class="top-view" class="top-view"
...@@ -194,7 +195,6 @@ export default { ...@@ -194,7 +195,6 @@ export default {
}) })
}, },
handleClickRecord() { handleClickRecord() {
console.log("11", 11)
this.$u.route({ this.$u.route({
url: 'pages/learn/answer', url: 'pages/learn/answer',
params: { params: {
...@@ -208,6 +208,13 @@ export default { ...@@ -208,6 +208,13 @@ export default {
this.show = false this.show = false
}, 2500) }, 2500)
}, },
customBack() {
console.log("111", 111)
this.$u.route({
type: 'tab',
url: 'pages/index/index'
})
}
}, },
} }
</script> </script>
......
...@@ -6,92 +6,6 @@ ...@@ -6,92 +6,6 @@
// } // }
const TOTAL = 100 const TOTAL = 100
const lists = [
{
type: 1,
title: '采用QS1电桥测量tanδ的接线方式一般有差接线及和接线。',
answerList: [
{
sort: 'A',
text: '正确',
},
{
sort: 'B',
text: '错误',
},
],
answer: 'A',
explain:
'极性电介质在外电场作用下,由偶极子分子的转向形成的极化称为偶极子式极化。',
index: 0,
rightKey: ['A'],
},
{
type: 2,
title:
'空气间隙的操作冲击击穿电压数值大小不仅与间隙距离、电极形状、电极极性有关,而且与操作冲击电压波的波前时间的长短有关。',
answerList: [
{
sort: 'A',
text: '正确',
},
{
sort: 'B',
text: '错误',
},
],
answer: 'B',
explain:
'极性电介质在外电场作用下,由偶极子分子的转向形成的极化称为偶极子式极化。',
index: 1,
rightKey: ['B'],
},
{
type: 3,
title: '西林电桥采用正接线及反接线时,其测试原理相同',
answerList: [
{
sort: 'A',
text: '影响',
},
{
sort: 'B',
text: '影响很小',
},
{
sort: 'C',
text: '影响很大',
},
{
sort: 'D',
text: '无影响',
},
],
answer: 'B,C',
explain:
'双臂电桥是在单臂电桥的基础上增加特殊机构,以消除测试时连接线和接线柱接触电阻对测量结果的影响。',
index: 2,
rightKey: ['B', 'C'],
},
{
type: 2,
title: '测试标题测试标题测试标题测试标题',
answerList: [
{
sort: 'A',
text: '是',
},
{
sort: 'B',
text: '否',
},
],
answer: 'B',
explain: '测试内容测试内容测试内容测试内容测试内容测试内容',
index: 3,
rightKey: ['B'],
},
]
// 请求一页数据 // 请求一页数据
function request({ currentPage, size, onSuccess, onFailed }, vm) { function request({ currentPage, size, onSuccess, onFailed }, vm) {
......
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