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

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

parents 47da2742 69f776e3
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
const globalData = getApp().globalData const globalData = getApp().globalData
globalData.photo.productList = result globalData.photo.productList = result
this.dataList = result this.dataList = result
var item = result[0] var item = result[0]
globalData.photo.waterSetting = item.userWatermark globalData.photo.waterSetting = item.userWatermark
this.rightList = item.list this.rightList = item.list
}, },
...@@ -108,8 +108,8 @@ ...@@ -108,8 +108,8 @@
//顶部点击 //顶部点击
handleTopItemChange: function(ikey, item) { handleTopItemChange: function(ikey, item) {
this.activeTop = ikey this.activeTop = ikey
this.rightList = item.list this.rightList = item.list
const photo = getApp().globalData.photo const photo = getApp().globalData.photo
photo.waterSetting = item.userWatermark photo.waterSetting = item.userWatermark
uni.pageScrollTo({ uni.pageScrollTo({
scrollTop: 0, scrollTop: 0,
......
...@@ -130,7 +130,12 @@ ...@@ -130,7 +130,12 @@
'token': getApp().globalData.token, 'token': getApp().globalData.token,
'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