Commit b1fc2f7d authored by 李超鹏's avatar 李超鹏

Merge remote-tracking branch 'origin/dev-photo-v2' into dev-photo-v2

parents 50a5e668 01df1405
......@@ -97,12 +97,14 @@
signUrl:'',
jumpLoginStatus:true,
settleRecommend:''
settleRecommend:'',
navHeight:0, //导航栏高度
rpxScreenHeight:0,// 照相视框高度
},
onLaunch: function() {
this.getSystemInfo()
this.checkUpdate()
var that=this
......@@ -122,7 +124,18 @@
},
onShow: function() {},
methods: {
getSystemInfo(){
try {
let a = wx.getSystemInfoSync();
// this.globalData.platform = systemInfo.platform, this.globalData.pixelRatio = a.pixelRatio,
// this.globalData.statusBarHeight = a.statusBarHeight, this.globalData.navHeight = a.statusBarHeight / a.screenWidth * 750 + 90,
// this.globalData.rpxScreenHeight = a.screenHeight / a.screenWidth * 750, this.globalData.screenWidth = a.screenWidth,
// this.globalData.screenHeight = a.screenHeight;
this.globalData.navHeight = a.statusBarHeight / a.screenWidth * 750 + 90
this.globalData.rpxScreenHeight = a.screenHeight / a.screenWidth * 750
} catch (a) {}
},
//检查更新
checkUpdate: function () {
const updateManager = wx.getUpdateManager()
......
......@@ -110,25 +110,29 @@
},
{
"path": "pages/photo/product",
"path": "pages/take/detail",
"style": {
"navigationBarTitleText": "扳手会工单规范"
"navigationBarTitleText": "工单详情"
}
},
{
"path": "pages/take/detail",
"path": "pages/photo/index",
"style": {
"navigationBarTitleText": "工单详情"
"navigationBarTitleText": "拍照小工具首页"
}
},
{
"path": "pages/photo/product",
"style": {
"navigationBarTitleText": "扳手会工单规范"
}
},
{
"path": "pages/photo/try",
"path": "pages/photo/take",
"style": {
"navigationStyle":"custom",
"navigationBarTitleText": "拍照",
"navigationBarBackgroundColor": "#333333",
"navigationBarTextStyle": "#FFFFFF",
......@@ -136,8 +140,6 @@
}
},
{
"path": "pages/photo/detail",
"style": {
......@@ -148,10 +150,6 @@
}
},
{
"path": "pages/photo/preview",
"style": {
......@@ -177,17 +175,6 @@
"navigationBarTitleText": "扳手会工单规范"
}
},
{
"path": "pages/photo/take",
"style": {
"navigationBarTitleText": "拍照-ljd",
"disableScroll": true
}
},
{
"path": "pages/index/success",
"style": {
......@@ -289,7 +276,7 @@
"query": "" //启动参数,在页面的onLoad函数里面得到
},{
"name": "拍照小工具", //模式名称
"path": "pages/photo/try", //启动页面,必选
"path": "pages/photo/take", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到
},{
"name": "基本信息", //模式名称
......
This diff is collapsed.
This diff is collapsed.
......@@ -185,10 +185,12 @@
getLocation() {
let that = this
uni.getLocation({
type: 'wgs84',
type: 'gcj02',
success: function(res) {
that.longitude = res.longitude
that.latitude = res.latitude
console.log(res,'res')
that.longitude = parseFloat(res.longitude).toFixed(4)
that.latitude = parseFloat(res.latitude).toFixed(3)
console.log(that.longitude,'that.longitude',that.latitude,'that.latitude')
that.baiduLocation()
},
fail() {
......@@ -342,7 +344,8 @@
//第一步: 拍照
takePhoto() {
this.getLocation()
return
let that = this
this.ctx.takePhoto({
quality: 'high',
......
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