Commit 3e397de3 authored by 李俊赕's avatar 李俊赕

Merge branch 'dev-photo-tools' of...

Merge branch 'dev-photo-tools' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-tools
parents 1741eb39 ed153133
{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
// launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
"version": "0.0",
"configurations": [{
"type": "uniCloud",
"default": {
"launchtype": "remote"
}
}
]
}
......@@ -9,7 +9,7 @@
{
"path": "pages/photo/product",
"style": {
"navigationBarTitleText": "选择产品"
"navigationBarTitleText": "扳手会工单规范"
}
},
{
......@@ -65,7 +65,7 @@
{
"path": "pages/photo/brand",
"style": {
"navigationBarTitleText": "选择品牌"
"navigationBarTitleText": "扳手会工单规范"
}
},
{
......
......@@ -13,6 +13,7 @@
:autoplay="false"
:circular='false'
mode="dot"
:current="done_count"
></u-swiper>
</view>
<view class="bottomView">
......@@ -48,6 +49,7 @@
last_done_count:0,
swiperList:[],
windowHeight:0,
title:''
}
},
watch:{
......@@ -104,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({
......@@ -146,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 + ')'
})
}
......@@ -211,7 +224,7 @@
.topView{
background-color: #333333;
width: 100%;
height: 146rpx;
height: 12%;
display: flex;
align-items: center;
......@@ -225,7 +238,7 @@
.centerBackView{
background-color: #333333;
height: 568rpx;
height: 47.3%;
display: flex;
flex-direction: row;
}
......@@ -240,7 +253,7 @@
.bottomView{
background-color: #333333;
width: 100%;
height: 488rpx;
height: 40.7%;
position: fixed;
bottom: 0;
display: flex;
......
......@@ -138,7 +138,8 @@
+'?current_image=' + current_image
+'&image_count=' + item.image_count
+'&current_count=' + current_count
+'&images=' + JSON.stringify(item.images) ,
+'&images=' + JSON.stringify(item.images)
+'&title=' + item.name,
})
},
......
<template>
<view class="">
<view class="blackBackColor">
<camera device-position="back" flash="off" style='width:100%; height:100vh;'>
<cover-view class="locationView">
<cover-view class="locationText u-m-l-20 u-m-t-30">{{longitude}}</cover-view>
......@@ -206,10 +206,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)
......@@ -273,7 +277,7 @@
})
let timer = setTimeout(()=>{
that.goBack()
},0)
},2000)
},
fail() {
......@@ -335,6 +339,11 @@
</script>
<style>
.blackBackColor{
background-color: #000000;
}
.bottomView {
background-color: #000000;
z-index: 5;
......
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