diff --git a/pages/knowledge/knowledge.vue b/pages/knowledge/knowledge.vue
index ee80d65..174e168 100644
--- a/pages/knowledge/knowledge.vue
+++ b/pages/knowledge/knowledge.vue
@@ -1,20 +1,20 @@
 <template>
 	<view class="wrap">
-			<view class="stabar"></view>
-			<view class="secbar">
+		<view class="stabar"></view>
+		<view class="secbar">
 			<view class="title">知识库</view>
-			</view>
-			<view class="mainwrap2">
-				<view class="subwrap">
-					<view class="message-list">
-					  <view class="artlist" v-for="(item, i) in knowledgeList" :key="i" @click="navClickHandler(item)">
+		</view>
+		<view class="mainwrap">
+			<view class="subwrap">
+				<view class="message-list">
+					<view class="artlist" v-for="(item, i) in knowledgeList" :key="i" @click="navClickHandler(item)">
 						<view class="timetop">{{item.createTime}}</view>
 						<view class="txtlist">{{item.title}}</view>
-					  </view>
 					</view>
+				</view>
 			</view>
-			</view>
-			<tabbar :page="page"></tabbar>
+		</view>
+		<tabbar :page="page"></tabbar>
 	</view>
 </template>
 
@@ -24,78 +24,83 @@
 		data() {
 			return {
 				page: "",
-				queryObj:{
-					pageNum:1,
-					pageSize:10
+				queryObj: {
+					pageNum: 1,
+					pageSize: 10
 				},
-				total:0,
-				isloading:false,
+				total: 0,
+				isloading: false,
 				//数据列表
-				knowledgeList:[]
+				knowledgeList: []
 			};
 		},
 		onShow() {
-			this.page= "know"
+			this.page = "know"
 		},
 		onLoad() {
-		  this.getContentList();
+			this.getContentList();
 		},
-		methods:{
+		methods: {
 			async getContentList() {
 				this.isloading = true
 				const {
 					data: res
-				} = await uni.$http.post('/small/library/listApp',this.queryObj)
+				} = await uni.$http.post('/small/library/listApp', this.queryObj)
 				this.isloading = false
 
-				res.rows.forEach(item=>{
-					item.uploadPath = uni.$http.baseUrl +item.uploadPath
+				res.rows.forEach(item => {
+					item.uploadPath = uni.$http.baseUrl + item.uploadPath
 				})
-				this.knowledgeList =[...this.knowledgeList,...res.rows]
+				this.knowledgeList = [...this.knowledgeList, ...res.rows]
 				this.total = res.total
 			},
 			navClickHandler(item) {
-			  uni.navigateTo({
-			    url: '/subpkg/knowledgeInfo/knowledgeInfo?guid='+item.guid
-			  })
+				uni.navigateTo({
+					url: '/subpkg/knowledgeInfo/knowledgeInfo?guid=' + item.guid
+				})
 			}
 		},
-		onReachBottom(){
-			if(this.queryObj.pageNum * this.queryObj.pageSize >= this.total) return uni.$showMsg('已展示所有内容')
-			if(this.isloading) return
+		onReachBottom() {
+			if (this.queryObj.pageNum * this.queryObj.pageSize >= this.total) return uni.$showMsg('已展示所有内容')
+			if (this.isloading) return
 			this.queryObj.pageNum++
 			this.getContentList()
 		},
-		components: {tabbar},
+		components: {
+			tabbar
+		},
 	}
 </script>
 
 <style lang="scss">
-
 	@import url("@/static/base_css.css");
+	
+	.mainwrap {
+		top: 5vh;	
+		height: 80vh;
+	}
 
-.title {
-	margin-top: 0;
-	padding-top: 16rpx;
-}
-.mainwrap2 {
-    height: calc(100% - 300rpx);
-}
-.artlist {
-    margin: 2% 0 3.5%;
-    padding: 4% 3%;
-    width: 100%;
-    font-size: 1.05rem;
-    box-shadow: 0 0 10rpx #ddd;
-    background: #fff;
-    border-radius: 20rpx;
-    box-sizing: border-box;
-}
-.timetop {
-    margin: 0 0 3%;
-    /* padding: 0 0 2%;
+	.title {
+		margin-top: 0;
+		padding-top: 16rpx;
+	}
+
+	.artlist {
+		margin: 2% 0 3.5%;
+		padding: 4% 3%;
+		width: 100%;
+		font-size: 1.05rem;
+		box-shadow: 0 0 10rpx #ddd;
+		background: #fff;
+		border-radius: 20rpx;
+		box-sizing: border-box;
+	}
+
+	.timetop {
+		margin: 0 0 3%;
+		/* padding: 0 0 2%;
     border-bottom: 1px solid #eee; */
-    color: #999;
-    font-size: 0.9rem;
-}
-</style>
+		color: #999;
+		font-size: 0.9rem;
+	}
+</style>
\ No newline at end of file
diff --git a/static/base_css.css b/static/base_css.css
index 2c2f135..8b9b87a 100644
--- a/static/base_css.css
+++ b/static/base_css.css
@@ -47,7 +47,7 @@ img {
 	z-index: 9999;
 	padding: 0 5%;
 	width: 100%;
-	height: 90rpx;
+	height: 6vh;
 	color: #fff;
 	line-height: 30px;
 	background-color: #bac6fc;
@@ -59,8 +59,8 @@ img {
 
 .mainwrap {
 	position: relative;
-	top: 90rpx;
-	height: calc(100% - 250rpx);
+	top: 6vh;
+	height: 84vh;
 	width: 100%;
 	background-image: linear-gradient(to bottom, #bac6fc, transparent 50%);
 	box-sizing: content-box;
@@ -216,9 +216,9 @@ h3.contit span {
 .secbar {
 	position: relative;
 	z-index: 99;
-	top: 90rpx;
+	top: 6vh;
 	width: 100%;
-	height: 90rpx;
+	height: 6vh;
 	background-color: #bac6fc;
 }
 
@@ -258,16 +258,16 @@ h3.contit span {
 	top: 0;
 	overflow: hidden;
 	overflow-y: auto;
-	padding: 1% 3%;
+	padding: 1% 3% 9%;
 	width: 94%;
 	height: 100%;
 }
 
 .mainwrap2, .mainwrap3, .tabwrap {
 	position: relative;
-	top: 90rpx;
+	top: 6vh;
 	width: 100%;
-	height: calc(100% - 180rpx);
+	height: 88vh;
 	background-image: linear-gradient(to bottom, #bac6fc, transparent 40%);
 	box-sizing: content-box;
 	overflow: hidden;
@@ -275,7 +275,7 @@ h3.contit span {
 
 .mainwrap3 {
 	top: 0;
-	height: calc(100% - 160rpx);
+	height: 89vh;
 	overflow-y: hidden;
 }
 
diff --git a/subpkg/address/address.vue b/subpkg/address/address.vue
index 8fc13dc..415375b 100644
--- a/subpkg/address/address.vue
+++ b/subpkg/address/address.vue
@@ -6,10 +6,6 @@
 		</view>
 		<view class="mainwrap2">
 			<view class="subwrap">
-				
-
-				<!-- 底部的边框线 -->
-				<image src="/static/cart_border@2x.png" class="address-border"></image>
 
 				<!-- 循环渲染地址信息 -->
 
@@ -40,7 +36,7 @@
 		</view>
 		<!-- 选择收货地址的盒子 -->
 		<view class="address-choose-box">
-			<button type="primary" size="mini" class="uni-button" @click="chooseAddress">批量刪除</button>
+			<button type="primary" size="mini" class="uni-button" @click="chooseAddress">全部刪除</button>
 			<button type="primary" size="mini" class="uni-button" @click="chooseAddress">新增地址</button>
 		</view>
 	</view>
@@ -60,7 +56,7 @@
 				options: [{
 					text: '删除',
 					style: {
-						backgroundColor: '#C00000'
+						backgroundColor: '#fb1010'
 					}
 				}],
 				addressList: []
@@ -149,9 +145,6 @@
 
 <style lang="scss">
 	@import url("@/static/base_css.css");
-	.mainwrap2 {
-		height: calc(100% - 350rpx);
-	}
 
 	.address-border {
 		display: block;
@@ -165,7 +158,7 @@
 		bottom: 0;
 		padding: 10rpx 0 50rpx 0;
 		width: 100vw;
-		height: 90rpx;
+		height: 7vh;
 		border-top: 1px solid #ddd;
 		background-color: #fff;
 		
diff --git a/subpkg/complete/complete.vue b/subpkg/complete/complete.vue
index 532e582..337817c 100644
--- a/subpkg/complete/complete.vue
+++ b/subpkg/complete/complete.vue
@@ -6,7 +6,7 @@
 			<image class="animg" src="/static/images/joy.png"></image>
 		</view>
 
-		<view class="mainwrap">
+		<view class="mainwrap2">
 		<view class="title">恭喜完成本次演练！</view>
 		<view class="question-wrap">
 		<view class="question-list">
@@ -444,9 +444,8 @@
 		}
 	}
 
-	.mainwrap {
-	    height: calc(100% - 150rpx);
-		overflow-y: auto;
+	.mainwrap2 {
+	    height: 94vh;
 	}
 
 	.title {
@@ -494,10 +493,11 @@
 		margin: 2% 3%;
 		padding: 2%;
 		width: 90%;
-		min-height: 400rpx;
+		height: 25vh;
 		background: #fff;
 		border: 1px solid #18c569;
-		border-radius: 10px;
+		border-radius: 20rpx;
+		overflow-y: auto;
 	}
 
 	.qucont {
@@ -538,7 +538,7 @@
 	.question-record {
 		margin: 3% 3% 5%;
 		width: 94%;
-		height: 25%;
+		height: 23vh;
 		overflow: hidden;
 
 		label {
diff --git a/subpkg/feedback/feedback.vue b/subpkg/feedback/feedback.vue
index 19cf5fb..1a05a9c 100644
--- a/subpkg/feedback/feedback.vue
+++ b/subpkg/feedback/feedback.vue
@@ -5,7 +5,7 @@
 	<view class="title">建议与意见反馈</view>
 	</view>
 <view class="mainwrap2">
-  <view class="subwrap">
+
 	<view class="table_index">
 		<!-- <uni-section title="建议与反馈" type="line"></uni-section> -->
 		<uni-forms :modelValue="formData">	
@@ -18,7 +18,7 @@
 			<button class="uni-button" size="mini" type="primary"  @click="toTable">提交</button>
 		</uni-forms>
 	</view>
- </view>
+
  </view>
 </view>
 </template>
@@ -69,12 +69,17 @@
 </script>
 <style scoped>
 	 @import url("@/static/base_css.css");
-	 
 	.table_index {
+		margin: 0 3%;
+		padding: 50rpx 30rpx;
+		width: 94%;
+		height: 82vh;
 		background-image: linear-gradient(to bottom, #fff, transparent);
-		height: 100%;
-		padding: 50px 30px;
-		border-radius: 3%;
+		border-radius: 20rpx;
+		box-sizing: border-box;
+	}
+	.uni-easyinput__content-textarea {
+		height: 500rpx;
 	}
 	.uni-button {
 		font-size: 30rpx;
diff --git a/subpkg/list/list.vue b/subpkg/list/list.vue
index ad8f2f3..51e6dd8 100644
--- a/subpkg/list/list.vue
+++ b/subpkg/list/list.vue
@@ -132,16 +132,16 @@
 	@import url("@/static/base_css.css");
 	
 	.mainwrap3 {
-		top: 50rpx;
-		height: calc(100% - 160rpx)
+		top: 3.5vh;
+		height: 90.5vh;
 	}
 	
    swiper {
-	   position: relative;
-	   top: 30px;
-	   margin: 0 3%;
-	   width: 94%;
-   	   height: 280rpx;
+		position: relative;
+		top: 3vh;
+		margin: 0 3%;
+		width: 94%;
+		height: 18vh;
    
    	.swiper-item,
    	image {
@@ -149,7 +149,7 @@
 		margin-left: 0.1%;
    		height: 100%;
 		align-items: center;
-   		border-radius: 10px;
+   		border-radius: 20rpx;
    	}
    }
    .nav-list {
@@ -159,7 +159,7 @@
 		margin: 4% 3%;
 		padding: 0 0 8%;
 		width: 94%;
-		height: 55%;
+		height: 52vh;
 		overflow-y: auto;
 
 		.nav-item {
diff --git a/subpkg/review/review.vue b/subpkg/review/review.vue
index fbd90ed..e676bc9 100644
--- a/subpkg/review/review.vue
+++ b/subpkg/review/review.vue
@@ -96,7 +96,7 @@
 		margin: 0 3%;
 		padding: 3%;
 		width: 88%;
-		height: 240rpx;
+		height: 13vh;
 		background-color: #fff;
 		border-radius: 20rpx;
 		border: 1px solid rgba(151, 1, 188, .45);
@@ -104,10 +104,11 @@
 		font-size: 32rpx;
 		line-height: 1.5;
 	}
+	
 	.question-info{
 		   margin-top: 20rpx;
 		   padding-top: 50rpx;
-		   height: calc(100% - 420rpx);
+		   height: 62vh;
 		   overflow: hidden;
 	}
 	
@@ -116,52 +117,10 @@
 		   height: 100%;
 	}
 	
-	.question-item {
-		   position: relative;
-		   margin: 2% 0 3%;
-		   width: 100%;
-		   height: 320rpx;  
-		   border-radius: 20rpx;
-		   overflow: hidden;
-	}
-	
-	.question-item image, .question-list image {
+	.question-list image {
 		   width: 100%;
 		   height: 100%;
 	}
-	
-	.question-num {
-			position: absolute;
-			z-index: 10;
-			width: 100%;
-			height: 100%;
-			background-color: rgba(0, 0, 0, .45);
-		}
-		
-	.question-txt {
-			position: absolute;
-			z-index: 100;
-			top: 3%;
-			left: 2%;
-			width: 96%;
-			color:#fff;	
-		}
-		
-		.question-txt .imgbox {
-			display: inline-block;
-			position: relative;
-			top: 20rpx;
-			margin: 0 12rpx;
-			width: 66rpx;
-			height: 66rpx;
-		}
-		
-		.question-txt .ordnum {
-			position: absolute;
-			left: 48rpx;
-			top: 22rpx;
-			font-size: 38rpx;
-		}
 		
 	.thumbtack {
 		   position: relative;
diff --git a/subpkg/role/role.vue b/subpkg/role/role.vue
index 6362532..1cb01f2 100644
--- a/subpkg/role/role.vue
+++ b/subpkg/role/role.vue
@@ -138,7 +138,7 @@
 }
 .mainwrap3 {
 	top: 0;
-	height: 100%;
+	height: 94vh;
 	overflow: hidden;
 }
 
@@ -199,7 +199,7 @@
 .startbtn {
 	position: relative;
 	z-index: 1;
-	bottom: 40%;
+	bottom: 33vh;
 	width: 100%;
 	height: 30%;
 	background:no-repeat 47.5% center;
@@ -224,7 +224,7 @@
 
 .cnote {
 	position: absolute;
-	bottom: 3%;
+	bottom: 3vh;
 	width: 100%;
 	color: rgba(255, 255, 255, .5);
 	font-size: 0.75rem;