Merge branch 'master' into xbx

components/content-item/index.vue

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

pages/index/index.vue

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

pages/release/video.vue

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

pages/user/contentDetails.vue

@@ -6,7 +6,7 @@
 		</view>
 		<view class="imgbox">
 			<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 v-else>
 				<video :src="info.video_path" controls></video>
@@ -134,6 +134,12 @@ export default {
 					this.info = res.data.article[0];
 				}
 			});
+		},
+        // 预览图片
+        viewImage() {
+            uni.previewImage({
+                urls: this.info.article_image
+            })
         }
 	}
 };