Commit 33747dc0 authored by Damon's avatar Damon

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

parents 93e4ca29 7e984544
......@@ -6,7 +6,7 @@
共
<text class="label-blue">{{ info.number }}</text
>道精编试题,通过率
<text class="label-blue">{{ $u.random(95, 99) }}%</text>
<text class="label-blue">{{ info.pass || $u.random(95, 99) }}%</text>
</view>
</view>
<u-button
......
......@@ -123,6 +123,7 @@ export default {
loading: false,
canExperience: false, // 体验资格
finishCount: 0,
pass: this.$u.random(95, 99),
}
},
computed: {
......@@ -169,7 +170,7 @@ export default {
this.data.questionWarehouse.echoMap.provinceId &&
this.data.questionWarehouse.echoMap.provinceId.fullName,
experience: this.canExperience,
pass: this.$u.random(95, 99) + '%',
pass: this.pass + '%',
days: this.detail.totalDayCount || 0,
today: this.detail.todayCount || 0,
total: this.detail.totalCount || 0,
......@@ -261,6 +262,7 @@ export default {
this.selected = info
page.info = null
this.visible = info.state
this.pass = this.$u.random(95, 99)
this.queryMyQuestionWarehouseDetail(this.selected.id)
} else {
this.queryMyQuestionWarehouseDetail(this.info.id || 0)
......@@ -339,6 +341,9 @@ export default {
var str = this.info.id ? 'selectedList' : 'selectCategory'
this.$u.route({
url: 'pages/learn/' + str,
params: {
pass: this.pass,
},
})
},
// 每日一练
......
......@@ -10,7 +10,7 @@
></u-navbar>
<view class="body-view">
<view class="image-view"
><image class="image" :src="successImage"></image
><image class="image" :src="kapianImage" mode="widthFix"></image
></view>
<view class="content-view">
<view class="first-line">
......@@ -60,6 +60,9 @@ export default {
},
computed: {
kapianImage() {
return process.uniEnv.qn_base_url + 'kapian.png'
},
customStyle() {
return {
height: '104rpx',
......@@ -222,8 +225,7 @@ export default {
text-align: center;
.image {
width: 700rpx;
height: 360rpx;
background-color: red;
// height: 360rpx;
border-radius: 24rpx;
box-shadow: 0px 10px 16px rgba(29, 53, 155, 0.2);
}
......
......@@ -51,6 +51,7 @@ export default {
return {
list: [], // 已选题库列表
loading: true,
currentPass: null,
}
},
computed: {
......@@ -68,6 +69,9 @@ export default {
},
},
onLoad(e) {
if (e && e.pass) {
this.currentPass = e.pass
}
this.loadList() // 获取已选题库列表
},
methods: {
......@@ -94,6 +98,9 @@ export default {
for (var item of res) {
if (item && item.echoMap && item.echoMap.questionWarehouseId) {
item.echoMap.questionWarehouseId.number = item.number
if (item.questionWarehouseId == this.questionWarehouseId) {
item.echoMap.questionWarehouseId.pass = this.currentPass
}
}
}
this.list = res
......
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