Commit 254e59f6 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 d6082216 a5c89327
const UNI_APP = { const UNI_APP = {
apiUrl: 'https://exam.testrest.banshouhui.com', apiUrl: 'https://exam.banshouhui.com',
qn_base_url: 'https://qn-static.banshouhui.com/study/', qn_base_url: 'https://qn-static.banshouhui.com/study/',
qn_asset_url: 'https://img2.banshouhui.com/', qn_asset_url: 'https://img2.banshouhui.com/',
uCenterUrl: 'http://rest-u.test.ibanshou.cn/', uCenterUrl: 'http://rest-u.test.ibanshou.cn/',
......
...@@ -220,6 +220,7 @@ export default { ...@@ -220,6 +220,7 @@ export default {
if (e?.recordId) this.recordId = e.recordId // 考试ID if (e?.recordId) this.recordId = e.recordId // 考试ID
if (e?.passPoint) this.passPoint = parseInt(e.passPoint) // 合格分数 if (e?.passPoint) this.passPoint = parseInt(e.passPoint) // 合格分数
if (e?.totalPoint) this.totalPoint = parseInt(e.totalPoint) // 考试总分/总条数 if (e?.totalPoint) this.totalPoint = parseInt(e.totalPoint) // 考试总分/总条数
if (e?.duration) this.timestamp = parseInt(e.duration) * 60 // 考试时间
switch (this.source) { switch (this.source) {
case 1: case 1:
case 2: case 2:
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
type="primary" type="primary"
shape="circle" shape="circle"
> >
开始模拟 开始模拟考试
</u-button> </u-button>
</view> </view>
</view> </view>
...@@ -63,6 +63,7 @@ export default { ...@@ -63,6 +63,7 @@ export default {
kemu: '考试科目', kemu: '考试科目',
tishu: '考试题数', tishu: '考试题数',
biaozhun: '合格标准', biaozhun: '合格标准',
duration: '考试时间',
guize: '出题规则', guize: '出题规则',
} }
}, },
...@@ -93,6 +94,7 @@ export default { ...@@ -93,6 +94,7 @@ export default {
tishu: `${res.totalPoint}题`, tishu: `${res.totalPoint}题`,
biaozhun: `${res.passPoint}分`, biaozhun: `${res.passPoint}分`,
passPoint: res.passPoint, passPoint: res.passPoint,
duration: `${res.duration}分钟`,
guize: '根据国家规定比例随机抽取' guize: '根据国家规定比例随机抽取'
} }
}) })
...@@ -114,7 +116,8 @@ export default { ...@@ -114,7 +116,8 @@ export default {
recordId: res.id, recordId: res.id,
source: 3, source: 3,
passPoint: this.info.passPoint, passPoint: this.info.passPoint,
totalPoint: this.info.totalPoint totalPoint: this.info.totalPoint,
duration: this.info.duration
} }
}) })
} }
......
...@@ -194,12 +194,12 @@ export default { ...@@ -194,12 +194,12 @@ export default {
}) })
}, },
handleClickRecord() { handleClickRecord() {
console.log("11", 11)
this.$u.route({ this.$u.route({
type: 'push', url: 'pages/learn/answer',
url: '/pages/learn/answer',
params: { params: {
source: 5, source: 5,
}, }
}) })
}, },
handleClick() { handleClick() {
......
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