Commit 46eb4745 authored by Facius's avatar Facius

Merge branch 'test' into dev-v1.0.0

parents 40b268b1 090f2f54
<template>
<view class="u-flex top">
<view class="u-flex avatar">
<!-- <view class="u-flex avatar">
<view class="avatar-list" v-for="(item, index) in avatars" :key="index">
<image :src="item" mode="aspectFill" />
</view>
</view>
</view> -->
<image :src="tongzhiImage" class="notice-image" />
<view class="notice">
<u-notice-bar
mode="horizontal"
mode="vertical"
type="none"
font-size="26"
:list="[noticeText]"
......@@ -116,6 +117,9 @@ export default {
defaultUrl() {
return process.uniEnv.qn_base_url + 'heads/'
},
tongzhiImage() {
return process.uniEnv.qn_base_url + 'tongzhi.png'
},
},
created() {
this.initData()
......@@ -174,6 +178,10 @@ export default {
margin-left: 15rpx;
display: flex;
align-items: center;
.notice-image {
width: 48rpx;
height: 48rpx;
}
.avatar {
.avatar-list {
margin-left: -15rpx;
......
......@@ -153,6 +153,9 @@ export default {
quanbutikuImage() {
return process.uniEnv.qn_base_url + 'quanbutiku.png'
},
slognImage() {
return process.uniEnv.qn_base_url + 'slogn.png'
},
marks() {
return [
{
......
......@@ -74,6 +74,28 @@
<view class="charts-content">
<view class="charts-box">
<qiun-data-charts
type="area"
:opts="{
xAxis: { labelCount: 4 },
extra: {
area: {
type: 'curve',
opacity: 0.2,
addLine: true,
width: 2,
gradient: true,
},
},
}"
:chartData="chartData"
:inScrollView="true"
:pageScrollTop="pageScrollTop"
canvasId="scroll-viewid"
fontColor="#9EA5BB"
background="none"
canvas2d="true"
/>
<!-- <qiun-data-charts
type="tarea"
:chartData="chartData"
:canvas2d="true"
......@@ -82,12 +104,7 @@
canvasId="scroll-viewid"
:pageScrollTop="pageScrollTop"
background="none"
:opts="{
xAxis: {
labelCount: 4,
},
}"
/>
/> -->
</view>
</view>
</view>
......@@ -241,13 +258,12 @@ export default {
keys.push(v)
})
keys.sort()
for (let index = 0; index < keys.length; index++) {
const ele = keys[index]
console.log('ele', ele)
this.chartData.categories.push(ele.replace(/\-/g, '.'))
this.chartData.series[0].data.push(res[ele].totalCount)
this.chartData.series[1].data.push(res[ele].rightCount)
this.chartData.series[0].data.push(res[ele].totalCount || '')
this.chartData.series[1].data.push(res[ele].rightCount || '')
}
})
.catch((err) => {
......@@ -464,7 +480,7 @@ export default {
.charts-content {
width: 100%;
height: 570rpx;
padding: 0 24rpx 10rpx 0rpx;
padding: 0 0 10rpx 0rpx;
.charts-box {
width: 100%;
height: 570rpx;
......@@ -474,6 +490,7 @@ export default {
.list-view {
padding-bottom: 44rpx;
min-height: 240rpx;
border-top: 2rpx solid #f7f9fc;
.list-content {
padding: 0 30rpx 20rpx 30rpx;
min-height: 44rpx;
......
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