Commit aeda5e81 authored by Damon's avatar Damon

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

parents 68636b55 f89e11cb
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
title-bold title-bold
:is-back="false" :is-back="false"
><slot ><slot
><view class="left-button" @click="handleClickLeftTop"
><image ><image
:src="quanbutikuImage" :src="quanbutikuImage"
class="left-image" class="left-image"
@click="handleClickLeftTop" ></image></view></slot
></image></slot
></u-navbar> ></u-navbar>
<view class="content"> <view class="content">
<view class="exam-title-view" @click="$u.throttle(handleSelect, 500)"> <view class="exam-title-view" @click="$u.throttle(handleSelect, 500)">
...@@ -613,11 +613,19 @@ export default { ...@@ -613,11 +613,19 @@ export default {
background-image: linear-gradient(to top, #f8fafd 0%, #e9f3ff 50%); background-image: linear-gradient(to top, #f8fafd 0%, #e9f3ff 50%);
background-size: 100% 520rpx; background-size: 100% 520rpx;
background-repeat: no-repeat; background-repeat: no-repeat;
.left-button {
width: 120rpx;
height: 80rpx;
display: flex;
justify-content: flex-start;
align-items: center;
.left-image { .left-image {
width: 32rpx; width: 32rpx;
height: 32rpx; height: 32rpx;
margin-left: 22rpx; margin-left: 22rpx;
} }
}
.content { .content {
height: 100%; height: 100%;
overflow: auto; overflow: auto;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<view class="first-line"> <view class="first-line">
<view class="serial-view">1</view> <view class="serial-view">1</view>
<view> <view>
持有学习卡的学员,扫描<text class="blue-text">卡背面的条码</text 持有学习卡的学员,扫描<text class="blue-text">卡背面的二维码</text
>完成绑定</view >完成绑定</view
></view ></view
> >
......
...@@ -68,7 +68,6 @@ ...@@ -68,7 +68,6 @@
<PopView <PopView
:visible.sync="showPop" :visible.sync="showPop"
title="确认选择" title="确认选择"
message="题库确认后不可更改,请查看确认"
@submit="handleClickSubmit" @submit="handleClickSubmit"
> >
<view v-for="(value, key) in selected" :key="key" class="pop-content"> <view v-for="(value, key) in selected" :key="key" class="pop-content">
......
...@@ -77,10 +77,18 @@ ...@@ -77,10 +77,18 @@
<qiun-data-charts <qiun-data-charts
type="area" type="area"
:opts="{ :opts="{
enableScroll: false,
padding: [15, 34, 0, 10], padding: [15, 34, 0, 10],
dataLabel: false, dataLabel: false,
xAxis: { labelCount: 4 }, xAxis: { labelCount: 4 },
legend: {
padding: 8,
fontColor: '#5A6073',
fontSize: 14,
},
extra: { extra: {
fontColor: '#9EA5BB',
fontSize: 11,
area: { area: {
type: 'curve', type: 'curve',
opacity: 0.2, opacity: 0.2,
...@@ -90,6 +98,8 @@ ...@@ -90,6 +98,8 @@
}, },
}, },
}" }"
:ontouch="true"
:onmovetip="true"
:chartData="chartData" :chartData="chartData"
:inScrollView="true" :inScrollView="true"
:pageScrollTop="pageScrollTop" :pageScrollTop="pageScrollTop"
...@@ -98,16 +108,6 @@ ...@@ -98,16 +108,6 @@
background="none" background="none"
canvas2d="true" canvas2d="true"
/> />
<!-- <qiun-data-charts
type="tarea"
:chartData="chartData"
:canvas2d="true"
:inScrollView="true"
fontColor="#9EA5BB"
canvasId="scroll-viewid"
:pageScrollTop="pageScrollTop"
background="none"
/> -->
</view> </view>
</view> </view>
</view> </view>
...@@ -486,7 +486,7 @@ export default { ...@@ -486,7 +486,7 @@ export default {
.charts-content { .charts-content {
width: 100%; width: 100%;
height: 570rpx; height: 570rpx;
margin-bottom: 30rpx; margin-bottom: 20rpx;
.charts-box { .charts-box {
width: 100%; width: 100%;
height: 570rpx; height: 570rpx;
......
...@@ -32,8 +32,12 @@ ...@@ -32,8 +32,12 @@
key == secondKey ? labels[firstKey][0][index].label : '非煤矿类' key == secondKey ? labels[firstKey][0][index].label : '非煤矿类'
}}</view> }}</view>
</view> </view>
<view class="label-content"> <view :class="['label-content', { first: key == firstKey }]">
<view v-for="(label, ind) in list" :key="ind" class="label-item"> <view
v-for="(label, ind) in list"
:key="ind"
:class="['label-item', { first: key == firstKey }]"
>
<!-- 选中为蓝底,非选中状态为白底 --> <!-- 选中为蓝底,非选中状态为白底 -->
<view <view
:class="[ :class="[
...@@ -220,10 +224,16 @@ export default { ...@@ -220,10 +224,16 @@ export default {
flex-wrap: wrap; flex-wrap: wrap;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
&.first {
justify-content: flex-start;
}
.label-item { .label-item {
padding-bottom: 24rpx; padding-bottom: 24rpx;
flex-shrink: 0; flex-shrink: 0;
display: inline-block; display: inline-block;
&.first {
padding-right: 24rpx;
}
.label-normal { .label-normal {
height: 104rpx; height: 104rpx;
width: 200rpx; width: 200rpx;
......
...@@ -136,7 +136,7 @@ export default { ...@@ -136,7 +136,7 @@ export default {
.selected-list-content { .selected-list-content {
height: 100%; height: 100%;
overflow: auto; overflow: auto;
margin-top: 24rpx;
.label-content { .label-content {
margin-bottom: 44rpx; margin-bottom: 44rpx;
.label-item { .label-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