Commit 8be141fe authored by Damon's avatar Damon

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

parents 73827d0b a30ce925
<template> <template>
<view class="question-bank-cell"> <view class="question-bank-cell">
<view class="label-normal"> <view class="label-normal">
<view>{{ info.label || info.title }}</view> <view class="title-view">{{ info.label || info.title }}</view>
<view class="type-view" v-if="!isAdd">{{
provinceName + '-' + examTypeText
}}</view>
<view class="label-text"> <view class="label-text">
共 共
<text class="label-blue">{{ info.number || 0 }}</text <text class="label-blue">{{ info.number || 0 }}</text
...@@ -40,6 +43,16 @@ export default { ...@@ -40,6 +43,16 @@ export default {
return {} return {}
}, },
computed: { computed: {
examTypeText() {
return this.info.echoMap && this.info.echoMap.type
},
provinceName() {
return (
this.info.echoMap &&
this.info.echoMap.provinceId &&
this.info.echoMap.provinceId.fullName
)
},
isAdd() { isAdd() {
return this.type == 'add' return this.type == 'add'
}, },
...@@ -90,12 +103,20 @@ export default { ...@@ -90,12 +103,20 @@ export default {
align-items: center; align-items: center;
.label-normal { .label-normal {
width: 470rpx; width: 470rpx;
word-break: break-all;
.title-view {
font-size: 36rpx; font-size: 36rpx;
color: #191c27; color: #191c27;
font-weight: bold; font-weight: bold;
word-break: break-all; margin-bottom: 12rpx;
}
.type-view {
font-size: 28rpx;
color: #5a6073;
font-weight: bold;
}
.label-text { .label-text {
margin-top: 24rpx; margin-top: 12rpx;
font-size: 26rpx; font-size: 26rpx;
color: #5a6073; color: #5a6073;
.label-blue { .label-blue {
......
...@@ -197,6 +197,9 @@ export default { ...@@ -197,6 +197,9 @@ export default {
if (e && e.key) { if (e && e.key) {
this.$nextTick(() => { this.$nextTick(() => {
// setTimeout(() => { // setTimeout(() => {
if (e.key == 'today') {
e.key = 'total'
}
this.scrollId = 'part-' + e.key this.scrollId = 'part-' + e.key
// }, 500) // }, 500)
}) })
...@@ -222,8 +225,10 @@ export default { ...@@ -222,8 +225,10 @@ export default {
.then((res) => { .then((res) => {
this.days = [] this.days = []
for (var item of res) { for (var item of res) {
if (item.count >= 10) {
this.days.push(item.time.replace(/\-0/g, '\-')) this.days.push(item.time.replace(/\-0/g, '\-'))
} }
}
}) })
.catch((err) => { .catch((err) => {
console.log(err) console.log(err)
...@@ -475,7 +480,7 @@ export default { ...@@ -475,7 +480,7 @@ export default {
} }
.list-view { .list-view {
padding-bottom: 44rpx; padding-bottom: 44rpx;
min-height: 960rpx; min-height: 240rpx;
.list-content { .list-content {
padding: 0 30rpx 20rpx 30rpx; padding: 0 30rpx 20rpx 30rpx;
min-height: 44rpx; min-height: 44rpx;
......
...@@ -9,12 +9,11 @@ ...@@ -9,12 +9,11 @@
title-bold title-bold
></u-navbar> ></u-navbar>
<!-- 标签列表 --> <!-- 标签列表 -->
<!-- <scroll-view <scroll-view
class="select-category-content" class="select-category-content"
scroll-y scroll-y
:scroll-into-view="scrollId" :scroll-into-view="scrollId"
> --> >
<view class="select-category-content">
<view v-for="(items, key) in labels" :key="key" class="label-list"> <view v-for="(items, key) in labels" :key="key" class="label-list">
<view <view
v-for="(list, index) in items" v-for="(list, index) in items"
...@@ -26,11 +25,6 @@ ...@@ -26,11 +25,6 @@
? minHeight + 'px' ? minHeight + 'px'
: 0, : 0,
}" }"
>
<scroll-view
scroll-y
:scroll-into-view="scrollId"
class="select-category-content + key"
> >
<view class="label-title" :id="key + index"> <view class="label-title" :id="key + index">
<!-- 品类title --> <!-- 品类title -->
...@@ -55,15 +49,13 @@ ...@@ -55,15 +49,13 @@
</view> </view>
</view> </view>
</view> </view>
</scroll-view>
</view> </view>
</view> </view>
<!-- 标签加载中 --> <!-- 标签加载中 -->
<view class="tag-loading-view" v-if="tapLoading"> <view class="tag-loading-view" v-if="tapLoading">
<u-loading mode="flower"></u-loading> <u-loading mode="flower"></u-loading>
</view> </view>
<!-- </scroll-view> --> </scroll-view>
</view>
</view> </view>
</template> </template>
...@@ -172,22 +164,6 @@ export default { ...@@ -172,22 +164,6 @@ export default {
for (var item of res) { for (var item of res) {
if (item.parentId == data.id) { if (item.parentId == data.id) {
this.labels[key2][i].push(item) this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
this.labels[key2][i].push(item)
} }
} }
} }
......
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