diff --git a/src/pages.json b/src/pages.json
index 2d4f51ea..9cd6dcfe 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
     "pages": [
         {
             "path": "pages/index/index",
@@ -19,6 +18,15 @@
                 }
             }
         },
+        {
+            "path": "pages/courseDetail/submit",
+            "style": {
+                "navigationBarTitleText": "提交评价",
+                "app-plus": {
+                    "titleNView": false
+                }
+            }
+        },
         {
             "path": "pages/study/index",
             "style": {
@@ -155,165 +163,4 @@
         }
     },
     "uniIdRouter": {}
-=======
-	"pages": [{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "首页",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/courseDetail/index",
-			"style": {
-				"navigationBarTitleText": "课程详情",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/courseDetail/submit",
-			"style": {
-				"navigationBarTitleText": "提交评价",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/study/index",
-			"style": {
-				"navigationBarTitleText": "学习",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/intelligentAnswering/index",
-			"style": {
-				"navigationBarTitleText": "智能问答",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/scene/index",
-			"style": {
-				"navigationBarTitleText": "场景",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/me/index",
-			"style": {
-				"navigationBarTitleText": "我的",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": "登录",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/other/web_view",
-			"style": {
-				"navigationBarTitleText": "",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/login/ysxy",
-			"style": {
-				"navigationBarTitleText": "",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/search/search",
-			"style": {
-				"navigationBarTitleText": "",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/course/index",
-			"style": {
-				"navigationBarTitleText": "课程中心",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/course/study",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		}
-	],
-	"tabBar": {
-		"list": [{
-				"text": "首页",
-				"pagePath": "pages/index/index"
-			},
-			{
-				"text": "学习",
-				"pagePath": "pages/study/index"
-			},
-			{
-				"text": "场景",
-				"pagePath": "pages/scene/index"
-			},
-			{
-				"text": "我的",
-				"pagePath": "pages/me/index"
-			}
-		],
-		"color": "#666666",
-		"selectedColor": "#0066FF",
-		"fontSize": "16px",
-		"borderStyle": "white",
-		"borderColor": "#ffffff",
-		"height": "70px",
-		"spacing": "10px",
-		"midButton": {
-			"iconPath": "/static/images/icon/fawn.png",
-			"width": "86px",
-			"height": "86px",
-			"iconWidth": "90px"
-		}
-	},
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "AI智能培训",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8",
-		"navigationStyle": "custom",
-		"app-plus": {
-			"titleView": false,
-			"bounce": "none"
-		}
-	},
-	"uniIdRouter": {}
->>>>>>> 8af971b2f3c186031f86d692251cf77f91455270
 }
\ No newline at end of file
diff --git a/src/pages/courseDetail/submit.vue b/src/pages/courseDetail/submit.vue
index cee54cad..be117054 100644
--- a/src/pages/courseDetail/submit.vue
+++ b/src/pages/courseDetail/submit.vue
@@ -35,7 +35,7 @@
 					<view class="tab-btn" :class="activeTab == 2 ? 'is-active' : ''" @click="changeTab(2)">提问</view>
 				</view>
 				<view class="input-textarea">
-					<uv-textarea v-model="aaa" :placeholder="activeTab == 1?'请输入你的建议...':'请输入你的问题...'"></uv-textarea>
+					<uv-textarea v-model="aaa"  height="124" :placeholder="activeTab == 1?'请输入你的建议...':'请输入你的问题...'"></uv-textarea>
 				</view>
 			</view>
 		</view>
@@ -81,7 +81,7 @@ onLoad((params) => {});
 	margin-bottom: 30rpx;
 }
 .body-content {
-	// flex: 1;
+	flex: 1;
 	background-color: #ffffff;
 	border-radius: 15rpx;
 	padding: 36rpx;
@@ -141,6 +141,7 @@ onLoad((params) => {});
 }
 .tab {
 	display: flex;
+	margin-bottom: 30rpx;
 }
 .tab-btn {
 	width: 78rpx;
@@ -156,6 +157,10 @@ onLoad((params) => {});
 	color: #0066ff;
 	border: 2rpx solid #0066ff;
 }
+.input-textarea{
+	// height: 250rpx;
+	// padding-bottom: 250rpx;
+}
 .btn-box {
 	position: fixed;
 	bottom: 0;