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