From de0246b08702fa578eed90cc9e7344a3328936bf Mon Sep 17 00:00:00 2001
From: KingTeam888 <wy15862425272@163.com>
Date: Sat, 20 Apr 2024 17:29:33 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=8D=93?=
 =?UTF-8?q?=E7=AB=AF=E7=B1=BB=E5=9E=8B=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 19 ++--
 components/uni-drag-image/uni-drag-image.uvue | 97 ++++++++++++-------
 .../uni-moments-image/uni-moments-image.uvue  | 45 +++++++++
 manifest.json                                 |  2 +-
 pages/index/apply.uvue                        | 31 +++---
 pages/index/components/comment-input.uvue     | 29 +-----
 pages/index/components/comment.uvue           | 29 +-----
 pages/index/components/momentsHeader.uvue     |  5 -
 pages/index/index.scss                        |  7 --
 pages/index/index.uvue                        | 34 ++-----
 type/typeData.uts                             |  1 +
 11 files changed, 155 insertions(+), 144 deletions(-)
 create mode 100644 components/uni-moments-image/uni-moments-image.uvue

diff --git a/README.md b/README.md
index ecb9763..fc38444 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,17 @@
 ## 项目说明
 
-尽可能的还原了微信朋友圈的UI、交互，`uniapp x` 体验比 `uniapp` 要好很多，熟悉`ts`的朋友可以快速上手！
+尽可能的还原了微信朋友圈的UI、交互，仅在ios上真机测试了效果，安卓真机未测试，大家可以下载感受一下！
 
 ## 更新说明
 
-### 1.0.0（2024-04-19）
+### 1.0.2（2024-04-20）
+
+- 修复安卓端运行报错、类型补全等
+- 优化安卓端体验
+- 新增九宫格图片尺寸动态计算
+- 新增发表朋友圈页面图片尺寸动态计算
+
+### 1.0.1（2024-04-19）
 
 - 补全变量类型，修复安装打包、运行报错，🎉 支持安卓
 - 优化代码结构
@@ -28,10 +35,8 @@ video竖屏全屏退出后，视频出现黑屏为官方BUG，官方正在修复
 
 [查看BUG修复进度](https://issues.dcloud.net.cn/pages/issues/detail?id=1491)  
 
-## 预览
-
-<img src="https://img-cdn-tx.dcloud.net.cn/stream/plugin_screens/a7e92550-fc8d-11ee-829d-478a042f758e_0.png" width="200" /> <img src="https://img-cdn-tx.dcloud.net.cn/stream/plugin_screens/a7e92550-fc8d-11ee-829d-478a042f758e_1.png" width="200" /> <img src="https://img-cdn-tx.dcloud.net.cn/stream/plugin_screens/a7e92550-fc8d-11ee-829d-478a042f758e_2.png" width="200" />  
-
 ---
 
-## 微信/QQ：582639426
\ No newline at end of file
+## 微信/QQ：582639426！  
+
+## github下载地址：[高度还原微信朋友圈](https://github.com/lmsail/uniapp-x-moments)  
\ No newline at end of file
diff --git a/components/uni-drag-image/uni-drag-image.uvue b/components/uni-drag-image/uni-drag-image.uvue
index 31fd8bf..2779ddd 100644
--- a/components/uni-drag-image/uni-drag-image.uvue
+++ b/components/uni-drag-image/uni-drag-image.uvue
@@ -1,31 +1,41 @@
 <template>
 	<view>
 		<view class="addfile uni-row uni-row-wrap">
-			<view class="apply-image" v-for="(imageSrc, index) in imageList" v-if="imageList!!.length > 0" :style="move && currentIndex == index ? 'border: 1px dashed #eee;' : 'border: none'">
-				<image class="image" :id="`image_${index}`" mode="aspectFill" :src="imageSrc" @touchstart="(e: TouchEvent) => onTouchStart(e, index)" @touchmove="onTouchMove" @touchend="onTouchEnd"></image>
+			<view class="apply-image" v-for="(imageSrc, index) in imageList" :style="{
+				border: move && currentIndex == index ? '1px dashed #eeeeee;' : 'none',
+				width: imageSize + 'px',
+				height: imageSize + 'px'
+			}">
+				<image class="image" mode="aspectFill" 
+					:style="{ width: imageSize + 'px', height: imageSize + 'px' }" 
+					:id="`image_${index}`"
+					:src="imageSrc" 
+					@touchstart="(e: TouchEvent) => onTouchStart(e, index)" 
+					@touchmove="onTouchMove" 
+					@touchend="onTouchEnd"
+				></image>
 			</view>
-			<view class="uni-addfile uni-row uni-center" @click="chooseImage" v-if="imageList!!.length < count">
+			<view class="uni-addfile uni-row uni-center" id="image_10" :style="{ width: imageSize, height: imageSize }" @click="chooseImage" v-if="imageList.length < count">
 				<image class="plus" src="./plus.png" mode="scaleToFill"></image>
 			</view>
 		</view>
-		
-		<!-- 删除区域 -->
 		<view class="delete-area uni-row uni-column uni-center" ref="deleteArea" :class="{show: move, opacity: isInDeleteArea}" :style="safeBottomStyle">
 			<uni-icons type="trash" size="26" color="#fff"></uni-icons>
 			<text class="font-14 color-white">{{ isInDeleteArea ? '松手即可删除' : '删除' }}</text>
 		</view>
 	</view>
-</template> 
+</template>
  
-<script> 
+<script lang="uts"> 
 	/**
 	 * 图片9宫格拖拽删除
-	 * 注意：页面暂不支持滚动，滚动可能导致布局错乱
+	 * 注意：页面暂不支持滚动，滚动可能导致布局错乱 
 	 */
 	export default {
 		props: {
 			imageList: {
-				type: Array as PropType<Array<string>>
+				type: Array as PropType<any[]>,
+				default: [] as any[]
 			},
 			count: {
 				type: Number,
@@ -52,12 +62,23 @@
 				deleteAreaY: 0,
 				deleteTimer: -1,
 				isInDeleteArea: false,
+				
+				// 每张图片的尺寸，宽和高保持一致
+				imageSize: 90,
 			}
 		},
 		computed: {
 			safeBottomStyle() : string {
 				return `height: 100px;padding-bottom: ${this.bottomSafeHeight}px`;
-			},
+			}
+		},
+		watch: {
+			imageList: {
+				handler() {
+					this.$nextTick(() => this.resetImagesPosition());
+				},
+				deep: true
+			}
 		},
 		mounted() {
 			const sys = uni.getSystemInfoSync();
@@ -75,6 +96,17 @@
 			if (this.deleteAreaY == 0) {
 				this.deleteAreaY = sys.screenHeight - (100 + this.bottomSafeHeight);
 			}
+			
+			// 计算每张图片的尺寸，左边边距各位30px，每张图片之间间距5px
+			if (this.imageSize == 90) {
+				// #ifdef APP-ANDROID
+				this.imageSize = (((sys.windowWidth as number) - 75) / 3).toInt(); 
+				// #endif
+				
+				// #ifdef APP-IOS
+				this.imageSize = ((sys.windowWidth as number) - 75) / 3;
+				// #endif
+			}
 		},
 		methods: {
 			onTouchStart(e : TouchEvent, index: number) {
@@ -82,8 +114,8 @@
 				if (element == null) return;
 				
 				this.currentElement = element;
-				const nodeInfo = element.getBoundingClientRect() as NodeInfo;
-				this.nodePosition = [nodeInfo.left!, nodeInfo?.top!];
+				const nodeInfo = element.getBoundingClientRect();
+				this.nodePosition = [nodeInfo.left, nodeInfo.top];
 				this.currentIndex = index;
 				if (!this.move) {
 					this.move = true;
@@ -109,26 +141,25 @@
 			},
 			
 			imageMovingAction(x: number, y: number) {
-				// 实时更新当前图片位置 +-50 是图片尺寸的一半
-				this.currentElement?.style?.setProperty('position', 'fixed')
-				this.currentElement?.style?.setProperty('left', x - 50 + 'px')
-				this.currentElement?.style?.setProperty('top', y - 50 + 'px')
-				this.currentElement?.style?.setProperty('z-index', 1 + this.currentIndex)
-				this.currentElement?.style?.setProperty('opacity', 0.8)
+				const imageHalfSize = this.imageSize / 2;
+				this.currentElement?.style?.setProperty('position', 'fixed');
+				this.currentElement?.style?.setProperty('left', x - imageHalfSize + 'px');
+				this.currentElement?.style?.setProperty('top', y - imageHalfSize + 'px');
+				this.currentElement?.style?.setProperty('z-index', 1 + this.currentIndex);
+				this.currentElement?.style?.setProperty('opacity', 0.8);
 				// 判断当前y轴是否触碰到了删除区域
 				if (this.deleteAreaY > 0) {
-					this.isInDeleteArea = (y + 50) >= this.deleteAreaY;
+					this.isInDeleteArea = y + imageHalfSize >= this.deleteAreaY;
 				}
 			},
 			
 			// 移动结束重置图片位置
 			imageMovendAction() {
-				// this.currentElement?.style?.setProperty('position', 'relative')
 				this.currentElement?.style?.setProperty('left', this.nodePosition[0] + 'px')
 				this.currentElement?.style?.setProperty('top', this.nodePosition[1] + 'px')
 				this.currentElement?.style?.setProperty('z-index', 1);
 				this.currentElement?.style?.setProperty('opacity', 1); 
-				// this.resetImagesPosition(); // 重置所有图片位置
+				this.resetImagesPosition(); // 重置所有图片位置
 			},
 			
 			deleteImage() {
@@ -137,21 +168,19 @@
 					return;
 				}
 				this.isInDeleteArea = false;
-				this.imageList!!.splice(this.currentIndex, 1);
-				this.resetImagesPosition();
+				this.imageList.splice(this.currentIndex, 1);
 			},
 			
 			// 获取剩余的所有节点信息，并重置图片位置 
 			resetImagesPosition() {
-				const imageWith = 100; // 图片宽度
 				const spacing = 5; // 图片间的间隔
 				const startX = 30; // x轴起始边距
 				const staerY = this.startY; // y轴起始边距
-				for (let i = 0; i < this.imageList!!.length; i++) {
+				for (let i = 0; i < this.imageList.length; i++) {
 				    const row = Math.floor(i / 3); // 计算行数
 				    const col = i % 3; // 计算列数
-				    const x = startX + col * (100 + spacing); // 计算 x 轴坐标
-				    const y = staerY + row * (imageWith + spacing); // 计算 y 轴坐标
+				    const x = startX + col * (this.imageSize + spacing); // 计算 x 轴坐标
+				    const y = staerY + row * (this.imageSize + spacing); // 计算 y 轴坐标
 					this.setImagePosition(i, x, y);
 				}
 			},
@@ -159,7 +188,7 @@
 			// 设置图片位置
 			setImagePosition(index: number, x: number, y: number) {
 				const element = uni.getElementById<UniElement>(`image_${index}`);
-				element?.style?.setProperty('position', 'fixed')
+				element?.style?.setProperty('position', 'fixed');
 				element?.style?.setProperty('left', x + 'px'); 
 				element?.style?.setProperty('top', y + 'px');
 			},
@@ -176,20 +205,20 @@
 	.addfile {
 		margin-bottom: 30px;
 		.apply-image {
-			width: 100px;
-			height: 100px;
 			margin: 0 5px 5px 0;
+			min-width: 90px;
+			min-height: 90px;
 		}
 		
 		.uni-addfile, .image {
 			background-color: #eee;
-			width: 100px;
-			height: 100px;
+			width: 100%;
+			height: 100%;
 			border-radius: 3px;
 			
 			.plus {
-				width: 50px;
-				height: 50px;
+				width: 40px;
+				height: 40px;
 			}
 		}
 	}
diff --git a/components/uni-moments-image/uni-moments-image.uvue b/components/uni-moments-image/uni-moments-image.uvue
new file mode 100644
index 0000000..042bb86
--- /dev/null
+++ b/components/uni-moments-image/uni-moments-image.uvue
@@ -0,0 +1,45 @@
+<template>
+	<image 
+		class="image" 
+		v-for="(image, index) in imageList" 
+		:src="image" 
+		:style="{ width: imageSize, height: imageSize }"
+		mode="aspectFill" 
+		@click="previewImage(index)"
+	></image>
+</template>
+
+<script setup>
+	const props = defineProps({
+		imageList: Array as PropType<Array<String>>
+	});
+	
+	// TODO 待优化...
+	const system = uni.getSystemInfoSync();
+	
+	// 计算图片尺寸，这里的105是根据布局尺寸得来的
+	// 1、最外层左右 padding：15px -> 30px
+	// 2、每张图片右边距：5px -> 3张图片：15px
+	// 3、头像：45px，右侧边距：15px
+	const imageSize = computed<String>((): String => {
+		const imageCount = props.imageList!.length;
+		return imageCount >= 3 ? `${(system.screenWidth - 105) / 3}px` : `${(system.screenWidth - 105) / 2}px`;
+	});
+	
+	// 图片预览
+	const previewImage = (index: number) => {
+		uni.previewImage({
+			urls: props.imageList!,
+			current: index
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.image {
+		margin: 5px 5px 0 0;
+		// width: 90px;
+		// height: 90px;
+		border-radius: 2px;
+	}
+</style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 7327901..696c08d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "momentsApp",
-    "appid" : "",
+    "appid" : "__UNI__970F4C1",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
diff --git a/pages/index/apply.uvue b/pages/index/apply.uvue
index 1b56f21..7813143 100644
--- a/pages/index/apply.uvue
+++ b/pages/index/apply.uvue
@@ -11,8 +11,7 @@
 
 		<!-- 发表文字 -->
 		<view class="content">
-			<textarea class="uni-textarea font-16" cursor-color="#29ad68" :auto-focus="false" :auto-height="true"
-				:adjust-position="false" :maxlength="100"></textarea>
+			<textarea class="uni-textarea font-16" cursor-color="#29ad68" :auto-focus="true" :auto-height="true" :adjust-position="false" :maxlength="100"></textarea>
 
 			<!-- 图片上传 -->
 			<uni-drag-image ref="dragImage" :imageList="imageList" @chooseImage="chooseImageEvent"></uni-drag-image>
@@ -32,6 +31,7 @@
 	import UniList from '@/components/uni-list/uni-list.uvue';
 	import UniItem from '@/components/uni-list/uni-item.uvue';
 	import uniDragImage from '../../components/uni-drag-image/uni-drag-image.uvue';
+	// 
 	export default {
 		components: {
 			UniList,
@@ -41,17 +41,7 @@
 		data() {
 			return {
 				disabled: true,
-				imageList: [
-					"http://iph.href.lu/200x200?text=1&fg=666666&bg=cccccc",
-					"http://iph.href.lu/200x200?text=2&fg=666666&bg=cccccc",
-					"http://iph.href.lu/200x200?text=3&fg=666666&bg=cccccc",
-					"http://iph.href.lu/200x200?text=4&fg=666666&bg=cccccc",
-					"http://iph.href.lu/200x200?text=5&fg=666666&bg=cccccc",
-					"http://iph.href.lu/200x200?text=6&fg=666666&bg=cccccc",
-					"http://iph.href.lu/200x200?text=7&fg=666666&bg=cccccc",
-					"http://iph.href.lu/200x200?text=8&fg=666666&bg=cccccc",
-					"http://iph.href.lu/200x200?text=9&fg=666666&bg=cccccc",
-				] as string[],
+				imageList: [] as string[],
 
 				address: '', // 当前位置信息
 			};
@@ -82,13 +72,24 @@
 
 			// 发表朋友圈
 			apply() {
-
+				this.imageList = [
+					"http://iph.href.lu/200x200?text=1&fg=666666&bg=cccccc",
+					"http://iph.href.lu/200x200?text=2&fg=666666&bg=cccccc",
+					"http://iph.href.lu/200x200?text=3&fg=666666&bg=cccccc",
+					"http://iph.href.lu/200x200?text=4&fg=666666&bg=cccccc",
+					"http://iph.href.lu/200x200?text=5&fg=666666&bg=cccccc",
+					"http://iph.href.lu/200x200?text=6&fg=666666&bg=cccccc",
+					"http://iph.href.lu/200x200?text=7&fg=666666&bg=cccccc",
+					"http://iph.href.lu/200x200?text=8&fg=666666&bg=cccccc",
+					"http://iph.href.lu/200x200?text=9&fg=666666&bg=cccccc",
+				];
 			},
 
 			// 选择图片
 			chooseImageEvent() {
+				const count = this.imageList.length > 0 ? 9 - this.imageList.length : this.imageList.length;
 				uni.chooseImage({
-					count: 9,
+					count: count,
 					sizeType: ['original', 'compressed'],
 					sourceType: ['album', 'camera'],
 					success: res => {
diff --git a/pages/index/components/comment-input.uvue b/pages/index/components/comment-input.uvue
index aa864eb..61315cb 100644
--- a/pages/index/components/comment-input.uvue
+++ b/pages/index/components/comment-input.uvue
@@ -6,7 +6,6 @@
 			placeholder="回复查理斯:"
 			confirm-type="send"
 			:adjust-position="false"
-			@focus="showKeyboard"
 			@blur="hideKeyboard"
 			@keyboardheightchange="onKeyborardHeightChange" 
 		/>
@@ -19,17 +18,9 @@
 			return {
 				keyboardHeight: -100,
 				keyboardStatus: false,
-				keyboardCacheHeight: 0, // 键盘高度缓存，第一次获取后就缓存起来
 			}
 		},
 		mounted() {
-			
-			// 获取上一次缓存的键盘高度
-			let keyboardHeight = uni.getStorageSync('keyboardCacheHeight') as string;
-			if (keyboardHeight != '') {
-				this.keyboardCacheHeight = keyboardHeight.toInt();
-				this.keyboardHeightChange();
-			}
 			// 监听点击评论事件
 			uni.$on('commentScrollEvent', () => {
 				if (this.keyboardStatus) {
@@ -47,18 +38,11 @@
 			},
 			
 			// 键盘相关事件
-			// TODO 这里不太严谨，待优化...
 			onKeyborardHeightChange(event : UniInputKeyboardHeightChangeEvent) {
-				if (!this.keyboardStatus || this.keyboardCacheHeight > 0) {
+				if (!this.keyboardStatus) {
 					return;
 				}
-				if (event.detail.duration == 0) {
-					this.keyboardHeight = -100;
-				} else {
-					this.keyboardHeight = event.detail.height;
-				}
-				this.keyboardCacheHeight = this.keyboardHeight;
-				uni.setStorageSync('keyboardCacheHeight', this.keyboardCacheHeight);
+				this.keyboardHeight = event.detail.height;
 				this.keyboardHeightChange();
 			},
 			
@@ -67,13 +51,6 @@
 				(this.$refs['commentInput'] as UniInputElement).blur();
 				this.keyboardStatus = false;
 				this.keyboardHeight = -100;
-			},
-			
-			// 得到焦点 - 显示键盘
-			showKeyboard() {
-				if (this.keyboardCacheHeight > 0) {
-					this.keyboardHeight = this.keyboardCacheHeight;
-				}
 			}
 		}
 	}
@@ -89,7 +66,7 @@
 		right: 0;
 		z-index: 999;
 		transition-property: bottom;
-		transition-duration: 0.25s;
+		transition-duration: 100ms;
 		box-shadow: 0 -5px 5px -5px rgba(0, 0, 0, 0.3) inset;
 		
 		.uni-input {
diff --git a/pages/index/components/comment.uvue b/pages/index/components/comment.uvue
index 887b690..a35cd02 100644
--- a/pages/index/components/comment.uvue
+++ b/pages/index/components/comment.uvue
@@ -19,7 +19,7 @@
 		
 		<!-- 评论列表 -->
 		<view class="comment-list">
-			<view class="comment-item uni-row uni-items-center uni-row-wrap" :id="listId" hover-class="comment-hover" :hover-stay-time="100" @click="toComment">
+			<view class="comment-item uni-row uni-items-center uni-row-wrap" hover-class="comment-hover" :hover-stay-time="100" @click="toComment">
 				<text class="username font-16">查理斯：</text>
 				<text class="font-16">这是什么地方？真好看啊</text>
 			</view>
@@ -33,40 +33,21 @@
 	</view>
 </template>
 
-<script>
+<script setup>
 	import CommentText from './comment-text.uvue';
-	export default {
-		components: {
-			CommentText
-		},
-		props: {
-			listId: {
-				type: String,
-				default: ""
-			}
-		},
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			toComment(e : PointerEvent) {
-				uni.$emit('commentScrollEvent', e!.y);
-			},
-		}
+	
+	const toComment = (e : PointerEvent) => {
+		uni.$emit('commentScrollEvent', e.y);
 	}
 </script>
 
 <style scoped lang="scss">
-// 点赞/评论列表
 .zancomment {
 	background-color: #F7F6F7;
 	border-radius: 5px;
 	
 	.username {
 		color: #596D95;
-		font-weight: 700;
 	}
 	
 	.zanlist {
diff --git a/pages/index/components/momentsHeader.uvue b/pages/index/components/momentsHeader.uvue
index b05356b..3577604 100644
--- a/pages/index/components/momentsHeader.uvue
+++ b/pages/index/components/momentsHeader.uvue
@@ -17,10 +17,6 @@
 <script>
 	export default {
 		props: {
-			windowInfo: {
-				type: Object,
-				default: {}
-			},
 			scrollTop: {
 				type: Number,
 				default: 0
@@ -51,7 +47,6 @@
 		},
 		methods: {
 			toApply() {
-				console.log('123')
 				uni.navigateTo({ url: '/pages/index/apply' });
 			},
 		}
diff --git a/pages/index/index.scss b/pages/index/index.scss
index 5f1f386..5121aca 100644
--- a/pages/index/index.scss
+++ b/pages/index/index.scss
@@ -34,13 +34,6 @@
 		.images {
 			flex-wrap: wrap;
 			padding: 0 0 5px 0;
-
-			.image {
-				margin: 5px 5px 0 0;
-				width: 90px;
-				height: 90px;
-				border-radius: 2px;
-			}
 		}
 
 		.address {
diff --git a/pages/index/index.uvue b/pages/index/index.uvue
index 94ba7a5..7ae2eb6 100644
--- a/pages/index/index.uvue
+++ b/pages/index/index.uvue
@@ -4,7 +4,6 @@
 		:refresher-enabled="false" 
 		:refresher-default-style="refresherStyle"
 		:refresher-triggered="refresherTriggered" 
-		@refresherrefresh="refresherrefresh" 
 		@scrolltolower="onScrollTolower"
 		@scroll="scrollEvent"
 		@touchstart="outsideTouchEvent"
@@ -31,7 +30,7 @@
 				<!-- 时间/点赞/评论按钮 -->
 				<comment-line></comment-line>
 				<!-- 点赞/评论信息列表 -->
-				<comment listId="comment-id"></comment> 
+				<comment></comment> 
 			</view>
 		</list-item>
 	
@@ -43,7 +42,7 @@
 				<text class="text">{{ text }}</text>
 				<!-- 图片 / 视频 -->
 				<view class="images uni-row">
-					<image class="image" v-for="(image, index) in imageList" :src="image" mode="aspectFill" @click="previewImage(index)"></image>
+					<uni-moments-image :imageList="imageList"></uni-moments-image>
 				</view>
 				<!-- 定位 -->
 				<text class="address mt-5">上海市 · 静安寺</text>
@@ -59,10 +58,10 @@
 	<moments-header ref="header" :scrollTop="scrollTop"></moments-header>
 	
 	<!-- 点赞/评论 -->
-	<comment-popup ref="commentPopupRef"></comment-popup>
+	<comment-popup ref="commentPopup"></comment-popup>
 	
 	<!-- 评论输入框 -->
-	<comment-input ref="commentInputRef"></comment-input>
+	<comment-input ref="commentInput"></comment-input>
 </template> 
 
 <script>
@@ -71,8 +70,9 @@
 	import CommentLine from './components/comment-line.uvue';
 	import CommentInput from './components/comment-input.uvue';
 	import Comment from './components/comment.uvue';
+	import uniMomentsImage from '../../components/uni-moments-image/uni-moments-image.uvue';
 	export default {
-		components: { CommentLine, Comment, MomentsHeader, CommentInput, CommentPopup },
+		components: { CommentLine, Comment, MomentsHeader, CommentInput, CommentPopup, uniMomentsImage },
 		data() {
 			return {
 				item_count: 20,
@@ -89,7 +89,7 @@
 					"https://img0.baidu.com/it/u=256816879,771155532&fm=253&app=120&size=w931&n=0&f=JPEG&fmt=auto?sec=1713286800&t=d5230b0cfdae75de3c452d973d302106",
 				],
 				scrollTop: 0,
-				keyboardHeight: 368, // ios 默认键盘高度，这里占位
+				keyboardHeight: 200, // ios 默认键盘高度，这里占位
 			}
 		},
 		onReady() {
@@ -106,24 +106,8 @@
 			// 目标元素以外的touch事件
 			outsideTouchEvent() {
 				// https://doc.dcloud.net.cn/uni-app-x/component/#methods
-				(this.$refs['commentPopupRef'] as ComponentPublicInstance).$callMethod('hideCommentPopup'); // 隐藏点赞/评论
-				(this.$refs['commentInputRef'] as ComponentPublicInstance).$callMethod('hideKeyboard'); // 隐藏评论框与键盘
-			},
-			
-			previewImage(index : number) {
-				uni.previewImage({
-					urls: this.imageList,
-					current: index,
-					indicator: "default",
-					loop: false
-				})
-			},
-
-			refresherrefresh() {
-				console.log('下拉刷新被触发了')
-				setTimeout(() => {
-					this.refresherTriggered = false;
-				}, 1000)
+				(this.$refs['commentPopup'] as ComponentPublicInstance).$callMethod('hideCommentPopup'); // 隐藏点赞/评论
+				(this.$refs['commentInput'] as ComponentPublicInstance).$callMethod('hideKeyboard'); // 隐藏评论框与键盘
 			},
 
 			onScrollTolower(_ : ScrollToLowerEvent) {
diff --git a/type/typeData.uts b/type/typeData.uts
index ed46961..9136983 100644
--- a/type/typeData.uts
+++ b/type/typeData.uts
@@ -1,4 +1,5 @@
 
+// 获取当前定位
 export type LocationType = {
 	altitude: number;
 	latitude: number;