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,33 +40,33 @@ function openSetting() {
//吊起设备原生相机相册取得文件,并自动上传七牛,返回七牛key,domain,本地file信息
function getPhoto(type, token) {
return new Promise((resolve, reject) => {
hasPermissionOfCamera().then((r) => {
if (!r) {
reject(false)
}
let sourceType = type == 1 ? ['album'] : ['album', 'camera']
uni.chooseImage({
count: 1, //默认9
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
sourceType: sourceType, //从相册选择
success: function(res) {
//上传七牛
let filePath = res.tempFiles[0].path //为需要上传的文件
upload(filePath, token)
.then((msg) => {
//最后七牛返回的key
resolve({
key: msg,
files: res.tempFiles,
})
// hasPermissionOfCamera().then((r) => {
// if (!r) {
// reject(false)
// }
let sourceType = type == 1 ? ['album'] : ['album', 'camera']
uni.chooseImage({
count: 1, //默认9
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
sourceType: sourceType, //从相册选择
success: function(res) {
//上传七牛
let filePath = res.tempFiles[0].path //为需要上传的文件
upload(filePath, token)
.then((msg) => {
//最后七牛返回的key
resolve({
key: msg,
files: res.tempFiles,
})
.catch((msg) => {
console.error(msg)
reject(msg)
})
},
})
})
.catch((msg) => {
console.error(msg)
reject(msg)
})
},
})
// })
})
}
......
......@@ -82,6 +82,9 @@
canvasId="scroll-viewid"
:pageScrollTop="pageScrollTop"
background="none"
:opts="{enableScroll:true,xAxis:{scrollShow:true,itemCount:4,disableGrid:true}}"
:ontouch="true"
:disableScroll="true"
/>
</view>
</view>
......@@ -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) {
......@@ -254,6 +304,7 @@ export default {
this.chartData.series[0].data = []
this.chartData.series[1].data = []
this.chartData.categories = []
for (var item in res) {
// this.chartData.series[0].data.push([20210801, 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