Commit 5f986d5b authored by 李超鹏's avatar 李超鹏

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

parents 47da2742 69f776e3
...@@ -131,6 +131,11 @@ ...@@ -131,6 +131,11 @@
'watermark': this.result 'watermark': this.result
}).then(res => { }).then(res => {
console.log(res) console.log(res)
if (res.result == true) {
const photo = getApp().globalData.photo
photo.waterSetting = this.result
}
this.$nextTick(function() { this.$nextTick(function() {
uni.hideLoading(); uni.hideLoading();
}) })
......
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