Commit e6064fb0 authored by Facius's avatar Facius

Merge branch 'dev-photo-v2' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-v2

parents 5a98221b c9401807
......@@ -101,6 +101,7 @@
globalData.photo.productList = result
this.dataList = result
var item = result[0]
globalData.photo.waterSetting = item.userWatermark
this.rightList = item.list
},
......@@ -108,6 +109,8 @@
handleTopItemChange: function(ikey, item) {
this.activeTop = ikey
this.rightList = item.list
const photo = getApp().globalData.photo
photo.waterSetting = item.userWatermark
uni.pageScrollTo({
scrollTop: 0,
duration: 0
......
......@@ -96,9 +96,11 @@
this.currentItem = photo.currentItem
},
compute: {
setting() {
waterSetting() {
// photo.waterSetting
const photo = getApp().globalData.photo
return photo.setting || null
console.log(photo.waterSetting,'photo.waterSetting')
return photo.waterSetting || null
}
},
watch: {
......
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