Merge branch 'frontend' of https://gitcode.net/qq_50679803/great-teamwork into frontend

teamwork/pages/post/post-detial.vue

@@ -26,6 +26,8 @@
 
 			<!-- 点赞和评论 -->
 			<view class="like-and-comment">
+				<!-- 删除键，只有我的帖子可见该组件 -->
+				<text class="del" @click="delPost">删除</text>
 				<view class="icon-and-num">
 					<image class="like-icon" :src="isLike==1?'../../static/post/喜欢2.png':'../../static/post/喜欢.png'"
 						style="width: 16px;height:16px;" @click="changeLike" />
@@ -50,7 +52,8 @@
 				<image
 					:src="'https://mp-6f6feaec-a026-4402-8e8d-18f7572890da.cdn.bspapp.com/cloudstorage/becea65c-89d7-4fe0-9c3f-2e08cdf911e8.jpg'"
 					class="icon-small" />
-				<span @click="addComment" class="comment-buttun"><text style="margin-left:8px;margin-top: 5px;float: left">写评论</text></span>
+				<span @click="addComment" class="comment-buttun"><text
+						style="margin-left:8px;margin-top: 5px;float: left">写评论</text></span>
 			</view>
 			<!-- 评论内容 -->
 			<view class="one-comment">
@@ -71,13 +74,21 @@
 				<u-line color="#EDEEF0"></u-line>
 			</view>
 		</view>
-		
+
 		<!-- 弹出的评论框 -->
 		<uni-popup ref="popup" type="dialog">
 			<uni-popup-dialog mode="input" message="评论成功" title="评论" placeholder="请输入内容" :duration="2000"
 				:before-close="true" @close="close" @confirm="confirm"></uni-popup-dialog>
 		</uni-popup>
 
+
+		<!-- 是否删除 -->
+		<uni-popup ref="alertDialog" type="dialog">
+			<uni-popup-dialog  cancelText="取消" confirmText="确定" title="警告" content="确定删除该帖子吗？"
+				@confirm="dialogConfirm"></uni-popup-dialog>
+		</uni-popup>
+
+
 	</view>
 </template>
 
@@ -112,6 +123,19 @@
 		},
 
 		methods: {
+
+			//删除确认弹窗
+			delPost() {
+				this.$refs.alertDialog.open();
+			},
+			dialogConfirm() {
+				console.log('点击确认')
+				this.$refs.alertDialog.close();
+			},
+			dialogClose() {
+				console.log('点击关闭')
+				this.$refsalertDialog.close();
+			},
 			//输入评论
 			confirm(value) {
 				// 输入框的值
@@ -128,10 +152,10 @@
 				this.$refs.popup.close();
 			},
 			//返回键
-			back(){
+			back() {
 				uni.navigateBack({
-						delta:1,//返回层数，2则上上页
-					})
+					delta: 1, //返回层数，2则上上页
+				})
 			},
 			// 图片放大
 			showPic(imgUrl) {
@@ -183,6 +207,12 @@
 		overflow: auto;
 	}
 
+	.del {
+		float: left;
+		font-size: 12px;
+		color: lightskyblue;
+	}
+
 	.comment-buttun {
 		background-color: #EDEEF0;
 		float: left;
@@ -341,13 +371,13 @@
 
 	.like-and-comment {
 		float: left;
-		margin-top: 5px;
+		margin-top: 10px;
 		margin-left: 10%;
 		height: 25px;
 		width: 80%;
 	}
-	
-	.like-and-time{
+
+	.like-and-time {
 		float: left;
 		margin-top: 10px;
 		margin-left: 5%;
@@ -363,7 +393,7 @@
 
 	.parting-line {
 		width: 100%;
-		margin-top: 20px;
+		margin-top: 10px;
 		background-color: #EDEEF0;
 		height: 10px;
 	}

teamwork/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.vue

@@ -192,9 +192,9 @@
 	.file-picker__box {
 		position: relative;
 		// flex: 0 0 33.3%;
-		width: 33.3%;
+		width: 100%;
 		height: 0;
-		padding-top: 33.33%;
+		padding-top: 33.3%;
 		/* #ifndef APP-NVUE */
 		box-sizing: border-box;
 		/* #endif */