Commit beb957cd authored by Facius's avatar Facius

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

parents cd6f9966 ff1475fa
...@@ -40,10 +40,10 @@ function openSetting() { ...@@ -40,10 +40,10 @@ function openSetting() {
//吊起设备原生相机相册取得文件,并自动上传七牛,返回七牛key,domain,本地file信息 //吊起设备原生相机相册取得文件,并自动上传七牛,返回七牛key,domain,本地file信息
function getPhoto(type, token) { function getPhoto(type, token) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
hasPermissionOfCamera().then((r) => { // hasPermissionOfCamera().then((r) => {
if (!r) { // if (!r) {
reject(false) // reject(false)
} // }
let sourceType = type == 1 ? ['album'] : ['album', 'camera'] let sourceType = type == 1 ? ['album'] : ['album', 'camera']
uni.chooseImage({ uni.chooseImage({
count: 1, //默认9 count: 1, //默认9
...@@ -66,7 +66,7 @@ function getPhoto(type, token) { ...@@ -66,7 +66,7 @@ function getPhoto(type, token) {
}) })
}, },
}) })
}) // })
}) })
} }
......
...@@ -82,6 +82,9 @@ ...@@ -82,6 +82,9 @@
canvasId="scroll-viewid" canvasId="scroll-viewid"
:pageScrollTop="pageScrollTop" :pageScrollTop="pageScrollTop"
background="none" background="none"
:opts="{enableScroll:true,xAxis:{scrollShow:true,itemCount:4,disableGrid:true}}"
:ontouch="true"
:disableScroll="true"
/> />
</view> </view>
</view> </view>
...@@ -219,7 +222,54 @@ export default { ...@@ -219,7 +222,54 @@ export default {
// ], // ],
// }, // },
// ] // ]
this.studyRecord(this.nearlySevenDays())
this.chartData.categories = [
'2013/1/24',
'2013/1/25',
'2013/1/28',
'2013/1/29',
'2013/1/30',
'2013/1/31',
'2013/2/1',
'2013/2/4',
'2013/2/5',
]
this.chartData.series = [
{
name: '成交量1',
pointShape: 'circle',
legendShape: 'circle',
data: [
15,
20,
45,
37,
43,
15,
20,
45,
37,
],
},
{
name: '成交量2',
pointShape: 'circle',
legendShape: 'circle',
data: [
20,
45,
37,
43,
15,
20,
45,
37,
43,
],
},
]
//this.studyRecord(this.nearlySevenDays())
}, },
// 每日一练统计 // 每日一练统计
everyTaskList(year, month) { everyTaskList(year, month) {
...@@ -254,6 +304,7 @@ export default { ...@@ -254,6 +304,7 @@ export default {
this.chartData.series[0].data = [] this.chartData.series[0].data = []
this.chartData.series[1].data = [] this.chartData.series[1].data = []
this.chartData.categories = []
for (var item in res) { for (var item in res) {
// this.chartData.series[0].data.push([20210801, res[item].totalCount]) // this.chartData.series[0].data.push([20210801, res[item].totalCount])
// this.chartData.series[0].data.push([20210802, res[item].totalCount]) // this.chartData.series[0].data.push([20210802, res[item].totalCount])
......
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