Commit 9f3437c5 authored by 李俊赕's avatar 李俊赕

edit-setting-take

parent 27008cb6
......@@ -132,7 +132,8 @@
}).then(res => {
console.log(res)
if (res.result == true) {
const photo = getApp().globalData.photo
const photo = getApp().globalData.photo
console.log(this.result,'this.result')
photo.waterSetting = this.result
}
......
......@@ -84,6 +84,7 @@
cameraHeight: 1000, // (4 / 3 * 750) 图片比例4:3
ratio: 0,
cameraChange: true,
waterSetting:null,
}
},
onLoad(e) {
......@@ -97,15 +98,18 @@
this.currentItem = photo.currentItem
},
computed: {
waterSetting() {
// photo.waterSetting
const photo = getApp().globalData.photo
console.log(photo.waterSetting, 'photo.waterSetting')
return photo.waterSetting || null
},
// waterSetting() {
// // photo.waterSetting
// const photo = getApp().globalData.photo
// console.log(photo.waterSetting, 'photo.waterSetting')
// return photo.waterSetting || null
// },
titleTxt(){
const waterSetting = this.waterSetting
let txt = ''
if(!waterSetting || !waterSetting.lower_right){
return ''
}
txt = waterSetting.lower_right && waterSetting.lower_right.title_text || ''
console.log(txt,'title_text','waterSetting',waterSetting)
return txt
......@@ -204,6 +208,7 @@
const globalData = getApp().globalData
this.navHeight = globalData.navHeight
this.ratio = globalData.screenHeight / globalData.rpxScreenHeight
this.waterSetting = getApp().globalData.photo.waterSetting
// this.cameraHeight = globalData.rpxScreenHeight
},
baiduLocation() {
......
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