This commit is contained in:
yanran200730
2022-05-24 18:40:56 +08:00
parent c0f62e94f7
commit 7beea2d1f8
4 changed files with 17 additions and 6 deletions

View File

@@ -26,7 +26,7 @@
<span>拍摄人</span> <span>拍摄人</span>
</div> </div>
<div class="right" @click="linkTo('./PersonnelSetting?id=' + id)"> <div class="right" @click="linkTo('./PersonnelSetting?id=' + id)">
<span>{{ createUserId ? '已选择' : '不限' }}</span> <span>{{ albumUserList.length ? '已选择' : '不限' }}</span>
<image src="./images/right.png" /> <image src="./images/right.png" />
</div> </div>
</div> </div>
@@ -100,6 +100,7 @@
this.createUserId = res.data.createUserId || '' this.createUserId = res.data.createUserId || ''
this.photoSource = res.data.photoSource || 0 this.photoSource = res.data.photoSource || 0
this.watermarkId = res.data.watermarkId || '' this.watermarkId = res.data.watermarkId || ''
this.albumUserList = res.data.albumUserList || []
} }
}) })
}, },
@@ -124,6 +125,8 @@
if (this.id) { if (this.id) {
uni.$emit('change') uni.$emit('change')
} else {
uni.$emit('update')
} }
setTimeout(() => { setTimeout(() => {

View File

@@ -20,9 +20,9 @@
</div> </div>
<div class="user-wrapper" v-if="userList.length"> <div class="user-wrapper" v-if="userList.length">
<div class="user" v-for="(item, index) in userList" :key="index"> <div class="user" v-for="(item, index) in userList" :key="index">
<div class="user-left"> <h2 class="user-left">
<AiOpenData v-if="item" type="userName" :openid="item"></AiOpenData> <AiOpenData v-if="item" type="userName" :openid="item"></AiOpenData>
</div> </h2>
<image src="./images/remove.png" @click="remove(index)" /> <image src="./images/remove.png" @click="remove(index)" />
</div> </div>
</div> </div>
@@ -121,6 +121,7 @@
.user { .user {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between;
height: 88px; height: 88px;
padding: 0 32px; padding: 0 32px;
border-bottom: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD;

View File

@@ -16,7 +16,7 @@
<div class="photo-bottom__top"> <div class="photo-bottom__top">
<image src="./images/clear.png" @click="isHide = true, currIndex = -1" /> <image src="./images/clear.png" @click="isHide = true, currIndex = -1" />
<h2>水印</h2> <h2>水印</h2>
<span @click="save">确定</span> <span @click="isHide = true">确定</span>
</div> </div>
<div class="waterlist"> <div class="waterlist">
<div <div
@@ -159,7 +159,6 @@
}) })
} }
}) })
// this.waterSrc = dataURL
}).catch(e => { }).catch(e => {
console.log(e) console.log(e)
}) })
@@ -458,7 +457,7 @@
} }
.watermark { .watermark {
bottom: 38px; // bottom: 38px;
} }
} }

View File

@@ -91,6 +91,14 @@
this.getAlbumList() this.getAlbumList()
this.getMsgList() this.getMsgList()
this.getUserInfo() this.getUserInfo()
uni.$on('update', () => {
this.getAlbumList()
})
},
destroyed () {
uni.$off('update')
}, },
methods: { methods: {