diff --git a/manifest.json b/manifest.json
index b14d530..e9579a4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,7 @@
 {
     "name" : "若依移动端",
-<<<<<<< HEAD
     "appid" : "__UNI__9F2C9D7",
-=======
     "appid" : "__UNI__9285214",
->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
     "description" : "",
     "versionName" : "1.1.0",
     "versionCode" : "100",
diff --git a/pages.json b/pages.json
index 272062b..a21c9ab 100644
--- a/pages.json
+++ b/pages.json
@@ -342,6 +342,4 @@
 	}
 
 }
-
-
 }
\ No newline at end of file
diff --git a/pages/common/postview/index.vue b/pages/common/postview/index.vue
index 965442a..bf7d06b 100644
--- a/pages/common/postview/index.vue
+++ b/pages/common/postview/index.vue
@@ -54,11 +54,11 @@
 				    <!-- 靠左对齐 -->
 					<view class="">
 						<view class="p-item">
-<<<<<<< HEAD
+
 						    <!-- <image style="width: 40rpx; height: 40rpx;" src="../static/images/icon/tu2-9.png" mode=""></image> -->
-=======
+
 						    <image style="width: 40rpx; height: 40rpx;" src="../../../static/images/icon/tu2-9.png" mode=""></image>
->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
+
 						    <text class="count">{{ postValue.transmitCount }}</text>
 						</view>
 					</view>
diff --git a/pages/post/postInfo/postInfo.vue b/pages/post/postInfo/postInfo.vue
index 2ef9a03..d4e6139 100644
--- a/pages/post/postInfo/postInfo.vue
+++ b/pages/post/postInfo/postInfo.vue
@@ -61,7 +61,7 @@
 	</view>
 	<!-- 评论区输入框 -->
 	<up-popup :show="showInput" duration="0" @close="close" @open="open" class="comment-po">
-		<view class="flex justifyBetween comment-input" :style="{ marginBottom: bottomVal + 'px' }">
+		<view class="flex justifyBetween comment-input" :style="{ marginBottom: bottomVal + 26 + 'px' }">
 			<view class="input-in flex alignCenter justifyCenter">
 				<input class="input-in-text" v-if="showInputText" focus="true" maxlength="55" :placeholder="placeholderInput" :adjust-position="false" />
 			</view>
@@ -521,5 +521,11 @@ page{
 	.comment-po{
 		// height: 500rpx;
 	}
+	
+	.input-bt-text{
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #FFFFFF;
+	}
 </style>
 
diff --git a/permission.js b/permission.js
index 453440d..7c268f4 100644
--- a/permission.js
+++ b/permission.js
@@ -1,6 +1,6 @@
 import { getToken } from "@/utils/auth";
 
-<<<<<<< HEAD
+
 // // 登录页面
 // const loginPage = "/pages/loginInfo/login";
 
@@ -10,7 +10,7 @@ import { getToken } from "@/utils/auth";
 //   "/pages/register",
 //   "/pages/common/webview/index",
 // ];
-=======
+
 // 登录页面
 const loginPage = "/pages/login";
 
@@ -20,7 +20,7 @@ const whiteList = [
   "/pages/register",
   "/pages/common/webview/index",
 ];
->>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
+
 
 // // 检查地址白名单
 // function checkWhite(url) {