Commit df0b5559 authored by 李俊赕's avatar 李俊赕

编辑-take页面

parent 8a0fba89
......@@ -93,8 +93,9 @@
const globalData = getApp().globalData
globalData.photo.productList = result
this.dataList = result
var item = result[0]
globalData.photo.waterSetting = item.userWatermark
let item = result[0]
console.log(result,item,'item')
globalData.photo.waterSetting = item && item.userWatermark || null
this.rightList = item.list
},
......
......@@ -30,7 +30,7 @@
:style="{'width':750 + 'rpx','height': cameraHeight + 'rpx'}"></canvas>
<view v-if="standardShow" class="page-mask" :z-index="10000">
<photo-standard :currentItem="currentItem" />
<view class="btn-close" @click="standardShow = false">
<view class="btn-close" @click="closeShadow">
<image class="icon icon-close" mode="aspectFit" src="/static/photo/icon-close.png">
</cover-image>
</view>
......@@ -85,6 +85,7 @@
ratio: 0,
cameraChange: true,
waterSetting:null,
shadowInitShow:true, // 第一次进入页面需显示弹窗
}
},
onLoad(e) {
......@@ -158,6 +159,10 @@
// })
},
methods: {
closeShadow(){
this.shadowInitShow = false
this.standardShow = true
},
goBack() {
uni.navigateBack({
delta: 1
......@@ -199,11 +204,13 @@
this.cameraInfo[type] = val
},
initData() {
this.standardShow = true
const globalData = getApp().globalData
this.navHeight = globalData.navHeight
this.ratio = globalData.screenHeight / globalData.rpxScreenHeight
this.waterSetting = getApp().globalData.photo.waterSetting
this.waterSetting = globalData.photo.waterSetting
if(this.shadowInitShow){
this.standardShow = true
}
// 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