Merge branch 'master' into xbx

This commit is contained in:
luyuan 2020-08-20 11:06:58 +08:00
commit fc4c187702
4 changed files with 12 additions and 6 deletions

View File

@ -1,6 +1,6 @@
<template> <template>
<view class="content-item"> <view class="content-item">
<view class="image"> <view class="image" @click="toDetailsPage">
<image class="cover" :src="info.article_pic" alt="没有图片"></image> <image class="cover" :src="info.article_pic" alt="没有图片"></image>
<image src="/static/image/user/5.png" class="play-icon" v-if="type==2"></image> <image src="/static/image/user/5.png" class="play-icon" v-if="type==2"></image>
</view> </view>

View File

@ -73,7 +73,7 @@
<u-popup v-model="publishstate" mode="bottom"> <u-popup v-model="publishstate" mode="bottom">
<view class="publish"> <view class="publish">
<view class="list"> <view class="list">
<view @click="navto('release/tosign')"> <view @click="navto('release/tosign')" v-if="0">
<image src="../../static/image/index/live.png"></image> <image src="../../static/image/index/live.png"></image>
<text>直播</text> <text>直播</text>
</view> </view>
@ -541,7 +541,7 @@ export default {
.list { .list {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-around;
width: 100%; width: 100%;
> view { > view {
display: flex; display: flex;

View File

@ -301,6 +301,7 @@ export default {
} else { } else {
this.tagcontent = ''; this.tagcontent = '';
this.show = false; this.show = false;
res.data.state = false;
this.fileListes.push(res.data); this.fileListes.push(res.data);
// this.$refs.uToast.show({ // this.$refs.uToast.show({
// title: res.message, // title: res.message,
@ -341,7 +342,6 @@ export default {
title: "提示", title: "提示",
content: "是否删除此标签?", content: "是否删除此标签?",
success: (res) => { success: (res) => {
console.log();
if (res.confirm) { if (res.confirm) {
this.delTable(id,index); this.delTable(id,index);
} }

View File

@ -6,7 +6,7 @@
</view> </view>
<view class="imgbox"> <view class="imgbox">
<view v-if="type==1"> <view v-if="type==1">
<image :src="list" mode="" v-for="list in info.article_image"></image> <image :src="list" mode="" @tap="viewImage" v-for="list in info.article_image"></image>
</view> </view>
<view v-else> <view v-else>
<video :src="info.video_path" controls></video> <video :src="info.video_path" controls></video>
@ -134,7 +134,13 @@ export default {
this.info = res.data.article[0]; this.info = res.data.article[0];
} }
}); });
} },
//
viewImage() {
uni.previewImage({
urls: this.info.article_image
})
}
} }
}; };
</script> </script>