Commit ed153133 authored by 和慭琛's avatar 和慭琛

bug fix

parent d72448f5
......@@ -9,7 +9,7 @@
{
"path": "pages/photo/product",
"style": {
"navigationBarTitleText": "选择产品"
"navigationBarTitleText": "扳手会工单规范"
}
},
{
......@@ -65,7 +65,7 @@
{
"path": "pages/photo/brand",
"style": {
"navigationBarTitleText": "选择品牌"
"navigationBarTitleText": "扳手会工单规范"
}
},
{
......
......@@ -49,6 +49,7 @@
last_done_count:0,
swiperList:[],
windowHeight:0,
title:''
}
},
watch:{
......@@ -105,8 +106,19 @@
this.images = [].concat(JSON.parse(e.images))
}
if(e && e.title){
this.title = e.title
if(this.title.length>6){
this.title = this.title.substr(0,6) + '...'
}
}
uni.setNavigationBarTitle({
title: '走线照片 (' + this.current_count + '/'+ this.image_count + ')'
title: this.title + ' (' + this.current_count + '/'+ this.image_count + ')'
})
uni.setNavigationBarColor({
......@@ -147,7 +159,7 @@
console.log('没有拍完 所有数量照片 current_count:'+this.current_count)
console.log('没有拍完 所有数量照片 current_image:'+this.current_image)
uni.setNavigationBarTitle({
title: '走线照片 (' + this.current_count + '/'+ this.image_count + ')'
title: this.title + ' (' + this.current_count + '/'+ this.image_count + ')'
})
}
......@@ -212,7 +224,7 @@
.topView{
background-color: #333333;
width: 100%;
height: 146rpx;
height: 12%;
display: flex;
align-items: center;
......@@ -226,7 +238,7 @@
.centerBackView{
background-color: #333333;
height: 568rpx;
height: 47.3%;
display: flex;
flex-direction: row;
}
......@@ -241,7 +253,7 @@
.bottomView{
background-color: #333333;
width: 100%;
height: 488rpx;
height: 40.7%;
position: fixed;
bottom: 0;
display: flex;
......
......@@ -179,10 +179,14 @@
this.canvas.setFillStyle('#f2f2f2')
let h = 1
let txtHeight=36
this.canvas.fillText('经度' + this.longitude, 20, canvasHeight - txtHeight * h++);
this.canvas.fillText('维度' + this.latitude, 20, canvasHeight - txtHeight * h++);
this.canvas.fillText('地址' + this.address, 20, canvasHeight - txtHeight * h++);
this.canvas.fillText('时间' + this.date, 20, canvasHeight - txtHeight * h++);
// '经度' +
// '维度' +
// '地址' +
// '时间' +
this.canvas.fillText(this.longitude, 20, canvasHeight - txtHeight * h++);
this.canvas.fillText(this.latitude, 20, canvasHeight - txtHeight * h++);
this.canvas.fillText(this.address, 20, canvasHeight - txtHeight * h++);
this.canvas.fillText(this.date, 20, canvasHeight - txtHeight * h++);
//加入 水印图片
this.canvas.drawImage(this.markPath, canvasWidth/2-200, canvasHeight/2 - 50, 400, 100)
......
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