From 1e0898c3b9ab35f24b7766394d2ec1945a974f50 Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Fri, 15 Mar 2024 15:25:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/tabbar/tabbar.vue           |   7 +-
 pages/my/my.vue                        |   2 +-
 static/base_css.css                    |  12 +-
 subpkg/address/address.vue             | 516 ++++++++++++++-----------
 subpkg/complete/complete.vue           |  45 ++-
 subpkg/feedback/feedback.vue           |  11 +-
 subpkg/knowledgeInfo/knowledgeInfo.vue |  15 +-
 subpkg/list/list.vue                   |   2 +-
 subpkg/practice/practice.vue           |   4 +-
 subpkg/privacy/privacy.vue             |   3 +
 subpkg/review/review.vue               |   2 +-
 subpkg/role/role.vue                   |  12 +-
 12 files changed, 370 insertions(+), 261 deletions(-)

diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index 5eed012..51c2e77 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -83,13 +83,16 @@
 </script>
 <style lang="scss">
 	.tab_bar {
+		padding: 10rpx 0 50rpx 0;
 		width: 100vw;
 		height: 90rpx;
 		position: fixed;
-		bottom: 30rpx;
+		bottom: 0;
+		border-top: 1px solid #ddd;
+		background-color: #fff;
 		/* 模糊大小就是靠的blur这个函数中的数值大小 */
 		// backdrop-filter: blur(10px);
-		border-radius: 60rpx;
+		//border-radius: 60rpx;
 
 		.tabbarBox {
 			display: flex;
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 34bc181..ca7c119 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="wrap">
 	  <view class="stabar"></view>
-	  <view class="mainwrap2">
+	  <view class="mainwrap">
 	    <view class="perinfo"> <span class="type-name"><img :src="avatarUrl"></img></span>
 	      <view class="dycd"> <span class="myname">{{name}}</span>
 	        <view class="myitem"> <span @click="showMedal()">勋章：{{medalNum}}<i :style="{'background-color':active == 0 ?'red':'none'}"></i></span> <span>挑战历史：{{challengeNum}}</span> </view>
diff --git a/static/base_css.css b/static/base_css.css
index d466cd6..2c2f135 100644
--- a/static/base_css.css
+++ b/static/base_css.css
@@ -58,9 +58,9 @@ img {
 
 
 .mainwrap {
-	margin-top: 90rpx;
-	padding-bottom: 5%;
-	height: calc(100% - 260rpx);
+	position: relative;
+	top: 90rpx;
+	height: calc(100% - 250rpx);
 	width: 100%;
 	background-image: linear-gradient(to bottom, #bac6fc, transparent 50%);
 	box-sizing: content-box;
@@ -71,7 +71,7 @@ img {
 	position: relative;
 	top: 1%;
 	width: 100%;
-	height: 17.5%;
+	height: 16.5%;
 	text-align: center;
 }
 
@@ -85,7 +85,7 @@ img {
 	top: -3.5%;
 	z-index: 1;
 	margin: 0 auto;
-	height: 65%;
+	height: 63%;
 	width: 94%;
 	box-sizing: content-box;
 	border-radius: 20rpx;
@@ -267,7 +267,7 @@ h3.contit span {
 	position: relative;
 	top: 90rpx;
 	width: 100%;
-	height: calc(100% - 200rpx);
+	height: calc(100% - 180rpx);
 	background-image: linear-gradient(to bottom, #bac6fc, transparent 40%);
 	box-sizing: content-box;
 	overflow: hidden;
diff --git a/subpkg/address/address.vue b/subpkg/address/address.vue
index 77ec73d..8fc13dc 100644
--- a/subpkg/address/address.vue
+++ b/subpkg/address/address.vue
@@ -1,245 +1,289 @@
 <template>
-<view class="wrap">
-	<view class="stabar"></view>
-	<view class="secbar"><label class="back" @click="back()"></label>
-	<view class="title">联系地址</view>
-	</view>
-  <view class="cart-container">
-    <!-- 选择收货地址的盒子 -->
-    <view class="address-choose-box">
-      <button type="primary" size="mini" class="btnChooseAddress" @click="chooseAddress">新增地址+</button>
-    </view>
-
-    <!-- 底部的边框线 -->
-    <image src="/static/cart_border@2x.png" class="address-border"></image>
-	
-	<!-- 循环渲染地址信息 -->
-	
-	<view>
-		<uni-swipe-action>
-		  <block v-for="(item, i) in addressList" :key="i">
-		    <uni-swipe-action-item :right-options="options" @click="swipeItemClickHandler(item)">
-               <view class="address-info-box">
-		     	 <view class="row1">
-		     		<view class="row1-left">
-		     		<view class="username">收货人：{{item.name}}</view>
-		     		</view>
-		     		<view class="row1-right">
-		     		  <view class="phone">电话：{{item.mobile}}</view>
-		     		  <uni-icons type="arrowright" size="16"></uni-icons>
-		     		</view>
-		     	 </view>
-		     	 <view class="row2">
-		     		<view class="row2-left">收货地址：</view>
-		     		<view class="row2-right">{{item.address}}</view>
-		     	 </view>
-		     	</view>
-		    </uni-swipe-action-item>
-		  </block>
-		</uni-swipe-action>
+	<view class="wrap">
+		<view class="stabar"></view>
+		<view class="secbar"><label class="back" @click="back()"></label>
+			<view class="title">联系地址</view>
+		</view>
+		<view class="mainwrap2">
+			<view class="subwrap">
+				
+
+				<!-- 底部的边框线 -->
+				<image src="/static/cart_border@2x.png" class="address-border"></image>
+
+				<!-- 循环渲染地址信息 -->
+
+				<view>
+					<uni-swipe-action>
+						<block v-for="(item, i) in addressList" :key="i">
+							<uni-swipe-action-item :right-options="options" @click="swipeItemClickHandler(item)">
+								<view class="address-info-box">
+									<view class="row1">
+										<view class="row1-left">
+											<view class="username">收货人：{{item.name}}</view>
+										</view>
+										<view class="row1-right">
+											<view class="phone">电话：{{item.mobile}}</view>
+											<uni-icons type="arrowright" size="16"></uni-icons>
+										</view>
+									</view>
+									<view class="row2">
+										<view class="row2-left">收货地址：</view>
+										<view class="row2-right">{{item.address}}</view>
+									</view>
+								</view>
+							</uni-swipe-action-item>
+						</block>
+					</uni-swipe-action>
+				</view>
+			</view>
+		</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>
+		</view>
 	</view>
-  </view>
-</view>
 </template>
 
 <script>
-  import { mapState, mapMutations, mapGetters } from 'vuex'
-  import addressVue from './address.vue';
-
-  export default {
-    data() {
-      return {
-		  options: [{
-		    text: '删除',
-		    style: {
-		      backgroundColor: '#C00000'
-		    }
-		  }],
-		addressList:[]
-      };
-    },
-	onLoad() {
-		this.initAddress();
-	},
-    methods: {
-      ...mapMutations('m_user', ['updateAddress']),
-	  async initAddress(){
-		  const {
-		  	data: res
-		  } = await uni.$http.post('/small/project/address/listAll',{userId:this.userId})
-		  if (!res.success) return uni.$showMsg()
-		   this.addressList = res.data;
-	  },
-      async chooseAddress() {
-        const [err, succ] = await uni.chooseAddress().catch(err => err)
-        if (err === null && succ.errMsg === 'chooseAddress:ok') {
-          this.updateAddress(succ)
-		
-		  const addressObj = {
-			  userId: this.userId,
-			  name: succ.userName,
-			  mobile: succ.telNumber,
-			  address: succ.provinceName + succ.cityName + succ.countyName + succ.detailInfo
-		  }
-		  this.addressList.push(addressObj)
-		  
-		  const {
-		  	data: res
-		  } = await uni.$http.post('/small/project/address/add',addressObj)
-		  if (!res.success) return uni.$showMsg()
-		    this.initAddress();
-        }
-
-        if (err && (err.errMsg === 'chooseAddress:fail auth deny' || err.errMsg === 'chooseAddress:fail authorize no response')) {
-          // 通过调用这个方法，让用户重新授权
-          this.reAuth()
-        }
-      },
-      // 让用户重新授权
-      async reAuth() {
-        const [err2, confirmResult] = await uni.showModal({
-          content: '检测到您没打开地址权限，是否去设置打开？',
-          confirmText: '确认',
-          cancelText: '取消'
-        })
-
-        if (err2) return
-
-        console.log(confirmResult)
-
-        if (confirmResult.cancel) return uni.$showMsg('您取消了地址授权！')
-        if (confirmResult.confirm) return uni.openSetting({
-          success: (settingResult) => {
-            if (!settingResult.authSetting['scope.address']) return uni.$showMsg('您取消了授权！')
-            if (settingResult.authSetting['scope.address']) return uni.$showMsg('授权成功！请选择地址')
-          }
-        })
-      },
-	  async swipeItemClickHandler(item){
-		  this.addressList = this.addressList.filter(x=>x.guid!=item.guid);
-		  const {
-		  	data: res
-		  } = await uni.$http.post('/small/project/address/remove',item.guid)
-		  if (!res.success) return uni.$showMsg()
-	  },
-	  back(){
-	  	uni.navigateBack({
-	  		delta:1,//返回层数，2则上上页
-	  	})
-	  }
-    },
-    computed: {
-      ...mapState('m_user', ['address','userId']),
-      ...mapGetters('m_user', ['addstr'])
-    }
-  }
+	import {
+		mapState,
+		mapMutations,
+		mapGetters
+	} from 'vuex'
+	import addressVue from './address.vue';
+
+	export default {
+		data() {
+			return {
+				options: [{
+					text: '删除',
+					style: {
+						backgroundColor: '#C00000'
+					}
+				}],
+				addressList: []
+			};
+		},
+		onLoad() {
+			this.initAddress();
+		},
+		methods: {
+			...mapMutations('m_user', ['updateAddress']),
+			async initAddress() {
+				const {
+					data: res
+				} = await uni.$http.post('/small/project/address/listAll', {
+					userId: this.userId
+				})
+				if (!res.success) return uni.$showMsg()
+				this.addressList = res.data;
+			},
+			async chooseAddress() {
+				const [err, succ] = await uni.chooseAddress().catch(err => err)
+				if (err === null && succ.errMsg === 'chooseAddress:ok') {
+					this.updateAddress(succ)
+
+					const addressObj = {
+						userId: this.userId,
+						name: succ.userName,
+						mobile: succ.telNumber,
+						address: succ.provinceName + succ.cityName + succ.countyName + succ.detailInfo
+					}
+					this.addressList.push(addressObj)
+
+					const {
+						data: res
+					} = await uni.$http.post('/small/project/address/add', addressObj)
+					if (!res.success) return uni.$showMsg()
+					this.initAddress();
+				}
+
+				if (err && (err.errMsg === 'chooseAddress:fail auth deny' || err.errMsg ===
+						'chooseAddress:fail authorize no response')) {
+					// 通过调用这个方法，让用户重新授权
+					this.reAuth()
+				}
+			},
+			// 让用户重新授权
+			async reAuth() {
+				const [err2, confirmResult] = await uni.showModal({
+					content: '检测到您没打开地址权限，是否去设置打开？',
+					confirmText: '确认',
+					cancelText: '取消'
+				})
+
+				if (err2) return
+
+				console.log(confirmResult)
+
+				if (confirmResult.cancel) return uni.$showMsg('您取消了地址授权！')
+				if (confirmResult.confirm) return uni.openSetting({
+					success: (settingResult) => {
+						if (!settingResult.authSetting['scope.address']) return uni.$showMsg('您取消了授权！')
+						if (settingResult.authSetting['scope.address']) return uni.$showMsg(
+							'授权成功！请选择地址')
+					}
+				})
+			},
+			async swipeItemClickHandler(item) {
+				this.addressList = this.addressList.filter(x => x.guid != item.guid);
+				const {
+					data: res
+				} = await uni.$http.post('/small/project/address/remove', item.guid)
+				if (!res.success) return uni.$showMsg()
+			},
+			back() {
+				uni.navigateBack({
+					delta: 1, //返回层数，2则上上页
+				})
+			}
+		},
+		computed: {
+			...mapState('m_user', ['address', 'userId']),
+			...mapGetters('m_user', ['addstr'])
+		}
+	}
 </script>
 
 <style lang="scss">
-@import url("@/static/base_css.css");
-  .address-border {
-    display: block;
-    width: 100%;
-    height: 5px;
-  }
-
-  .address-choose-box {
-    height: 90px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-
-  .address-info-box {
-    font-size: 12px;
-    height: 90px;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    padding: 0 5px;
-
-    .row1 {
-      display: flex;
-      justify-content: space-between;
-
-      .row1-right {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-      }
-    }
-
-    .row2 {
-      display: flex;
-      align-items: center;
-      margin-top: 10px;
-
-      .row2-left {
-        white-space: nowrap;
-      }
-    }
-  }
-  
-  .cart-container {
-    padding-bottom: 50px;
-	padding: 6% 3%;
+	@import url("@/static/base_css.css");
+	.mainwrap2 {
+		height: calc(100% - 350rpx);
+	}
+
+	.address-border {
+		display: block;
+		width: 100%;
+		height: 5px;
+	}
+
+	.address-choose-box {
+		display: flex;
+		position: fixed;
+		bottom: 0;
+		padding: 10rpx 0 50rpx 0;
+		width: 100vw;
+		height: 90rpx;
+		border-top: 1px solid #ddd;
+		background-color: #fff;
+		
+		.uni-button {
+			margin: 1% 2%;
+			font-size: 30rpx;
+			width: 55%;
+			height: 70rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background: #1367fe;
+			border: 1px solid #1367fe;
+			border-radius: 50rpx;
+			white-space: nowrap;
+		}
+		
+		.uni-button:first-child {
+			width: 35%;
+			background-color: #fff;
+			color: #1367fe;
+		}
+	}
+
+	.address-info-box {
+		display: flex;
+		margin: 10rpx 0;
+		padding: 0 10px;
+		height: 180rpx;
+		background: #fff;
+		border-radius: 20rpx;
+		font-size: 30rpx;
+		flex-direction: column;
+		justify-content: center;
+
+		.row1 {
+			display: flex;
+			justify-content: space-between;
+
+			.row1-right {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+			}
+		}
+
+		.row2 {
+			display: flex;
+			align-items: center;
+			margin-top: 10px;
+
+			.row2-left {
+				white-space: nowrap;
+			}
+		}
+	}
+
+	.cart-container {
+		padding-bottom: 50px;
+		padding: 6% 3%;
+
+	}
+
+	.cart-title {
+		height: 40px;
+		display: flex;
+		align-items: center;
+		padding-left: 5px;
+		border-bottom: 1px solid #EFEFEF;
+
+		.cart-title-text {
+			font-size: 14px;
+			margin-left: 10px;
+		}
+	}
+
+	.goods-item {
+		width: 750rpx;
+		box-sizing: border-box;
+		display: flex;
+		padding: 10px 5px;
+		border-bottom: 1px solid #f0f0f0;
+
+		.goods-item-left {
+			margin-right: 5px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.goods-pic {
+				width: 100px;
+				height: 100px;
+				display: block;
+			}
+		}
+
+		.goods-item-right {
+			display: flex;
+			flex: 1;
+			flex-direction: column;
+			justify-content: space-between;
+
+			.goods-name {
+				font-size: 13px;
+			}
+
+			.goods-info-box {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.goods-price {
+					color: #C00000;
+					font-size: 16px;
+				}
+			}
+		}
+	}
+
 	
-  }
-  
-  .cart-title {
-    height: 40px;
-    display: flex;
-    align-items: center;
-    padding-left: 5px;
-    border-bottom: 1px solid #EFEFEF;
-  
-    .cart-title-text {
-      font-size: 14px;
-      margin-left: 10px;
-    }
-  }
-  
-  .goods-item {
-    width: 750rpx;
-    box-sizing: border-box;
-    display: flex;
-    padding: 10px 5px;
-    border-bottom: 1px solid #f0f0f0;
-  
-    .goods-item-left {
-      margin-right: 5px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-  
-      .goods-pic {
-        width: 100px;
-        height: 100px;
-        display: block;
-      }
-    }
-  
-    .goods-item-right {
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-      justify-content: space-between;
-  
-      .goods-name {
-        font-size: 13px;
-      }
-  
-      .goods-info-box {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-  
-        .goods-price {
-          color: #C00000;
-          font-size: 16px;
-        }
-      }
-    }
-  }
-
-</style>
+</style>
\ No newline at end of file
diff --git a/subpkg/complete/complete.vue b/subpkg/complete/complete.vue
index 49d487f..b798dd9 100644
--- a/subpkg/complete/complete.vue
+++ b/subpkg/complete/complete.vue
@@ -54,7 +54,7 @@
 		</view>
 	</view>
 	<view class="popup-share" v-if="showShare">
-		<view @click="closeShare()" style="margin-left: 250px;">关闭</view>
+		<label @click="closeShare()" class="close-button"></label>
 		<label class="medimg"><image src="/static/images/medal_1.png"></image></label>
 		<view class="congrat">恭喜你获得1枚成就勋章！</view>
 		<view class="perinfo">
@@ -260,7 +260,7 @@
 			left: 50%;
 			transform: translate(-50%, -10%);
 			width: 300rpx;
-			height: 230rpx;
+			height: 300rpx;
 
 			image {
 				width: 100%;
@@ -281,8 +281,8 @@
 		}
 	}
 
-	.mainwrap3 {
-		top: 56rpx;
+	.mainwrap {
+	    height: calc(100% - 150rpx);
 		overflow-y: auto;
 	}
 
@@ -393,6 +393,11 @@
 			.item {
 				margin: 2% 0;
 				border-bottom: 1px dotted #ddd;
+				label {
+					color: #666;
+					font-size: 1.0rem;   
+					font-weight: 500;
+				}
 			}
 		}
 	}
@@ -435,4 +440,36 @@
 			height: 100%;
 		}
 	}
+	
+	.close-button {
+		position: absolute;
+		top: -60rpx;
+		right: -10rpx;
+		width: 50rpx;
+		height: 50rpx;
+		background-color: rgba(255, 255, 255, .5);
+		border: 1rpx solid rgba(255, 255, 255, .7);
+		border-radius: 50%;
+		transform: rotate(45deg);
+	}
+	
+	.close-button:before, .close-button:after {
+	  content: '';
+	  position: absolute;
+	  top: 50%;
+	  left: 50%;
+	  background: #333;
+	  border-radius: 50%;
+	  transform: translate(-50%, -50%);
+	}
+	 
+	.close-button:before {
+	  height: 24rpx;
+	  width: 4rpx;
+	}
+	 
+	.close-button:after {
+	  height: 4rpx;
+	  width: 24rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/subpkg/feedback/feedback.vue b/subpkg/feedback/feedback.vue
index fb40a4d..19cf5fb 100644
--- a/subpkg/feedback/feedback.vue
+++ b/subpkg/feedback/feedback.vue
@@ -7,7 +7,7 @@
 <view class="mainwrap2">
   <view class="subwrap">
 	<view class="table_index">
-		<uni-section title="建议与反馈" type="line"></uni-section>
+		<!-- <uni-section title="建议与反馈" type="line"></uni-section> -->
 		<uni-forms :modelValue="formData">	
 			<uni-forms-item label="手机" name="mobile">
 				<uni-easyinput type="text" v-model="formData.mobile" placeholder="请输入手机号码" />
@@ -69,18 +69,21 @@
 </script>
 <style scoped>
 	 @import url("@/static/base_css.css");
+	 
 	.table_index {
-		background-color: #fff;
+		background-image: linear-gradient(to bottom, #fff, transparent);
 		height: 100%;
 		padding: 50px 30px;
 		border-radius: 3%;
 	}
-	.uni-button{
-		font-size: 18px;
+	.uni-button {
+		font-size: 30rpx;
 		width: 100%;
 		height: 70rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
+		background: #1367fe;
+		border-radius: 50rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/subpkg/knowledgeInfo/knowledgeInfo.vue b/subpkg/knowledgeInfo/knowledgeInfo.vue
index 68d9e06..6fd9809 100644
--- a/subpkg/knowledgeInfo/knowledgeInfo.vue
+++ b/subpkg/knowledgeInfo/knowledgeInfo.vue
@@ -2,9 +2,10 @@
 <view class="wrap">
 	<view class="stabar"></view>
 	<view class="secbar"><label class="back" @click="back()"></label>
-	<view class="title"></view>
 	</view>
 	<view class="mainwrap2">
+		<view class="title">“三类场所”消防安全提示！“三类场所”消防安全提示！</view>
+		<view class="timetop">2024-03-04 11:33</view>
 		<view class="subwrap">
 		<view v-html="content"></view>
 		</view>
@@ -46,4 +47,16 @@
 
 <style lang="scss">
  @import url("@/static/base_css.css");
+ .mainwrap2 .title {
+	 margin: 0 3% 3%;
+	 text-align: left;
+ }
+ .timetop {
+     margin: 0 3% 3%;
+     color: #999;
+     font-size: 0.9rem;
+ }
+ .subwrap {
+	 height: calc(100% - 200rpx);
+ }
 </style>
diff --git a/subpkg/list/list.vue b/subpkg/list/list.vue
index 51ccced..ad8f2f3 100644
--- a/subpkg/list/list.vue
+++ b/subpkg/list/list.vue
@@ -133,7 +133,7 @@
 	
 	.mainwrap3 {
 		top: 50rpx;
-		height: calc(100% - 90rpx)
+		height: calc(100% - 160rpx)
 	}
 	
    swiper {
diff --git a/subpkg/practice/practice.vue b/subpkg/practice/practice.vue
index 244a7ae..0830c74 100644
--- a/subpkg/practice/practice.vue
+++ b/subpkg/practice/practice.vue
@@ -62,9 +62,11 @@
 
 .secbar label.back {
     position: absolute;
-	top: 6rpx;
+	top: 0;
     left: 4%;
     padding-left: 0;
+	width: 50rpx;
+	height: 50rpx;
     background: url(/static/images/icon_arbw.png) no-repeat left 40% center;
 	background-size: auto 50%;
 	background-color: rgba(255, 255, 255, .2);
diff --git a/subpkg/privacy/privacy.vue b/subpkg/privacy/privacy.vue
index d30368f..81896ba 100644
--- a/subpkg/privacy/privacy.vue
+++ b/subpkg/privacy/privacy.vue
@@ -47,4 +47,7 @@
 
 <style lang="scss">
  @import url("@/static/base_css.css");
+ .subwrap > view {
+	 margin: 0 2% 10% 2%;
+ }
 </style>
diff --git a/subpkg/review/review.vue b/subpkg/review/review.vue
index 52140eb..fbd90ed 100644
--- a/subpkg/review/review.vue
+++ b/subpkg/review/review.vue
@@ -125,7 +125,7 @@
 		   overflow: hidden;
 	}
 	
-	.question-item image {
+	.question-item image, .question-list image {
 		   width: 100%;
 		   height: 100%;
 	}
diff --git a/subpkg/role/role.vue b/subpkg/role/role.vue
index efa38fb..6362532 100644
--- a/subpkg/role/role.vue
+++ b/subpkg/role/role.vue
@@ -5,7 +5,7 @@
 	    <view class="mainwrap3"> 
 	      <img src="/static/images/bg_role.jpg" alt=""/>
 	      <view class="role_wrap">
-	        <view class="<strong>contit</strong>">请选择您在“<font style="color:#fd6d1f;">{{sceneName}}</font>”演练中的角色：</view>
+	        <view class="contit">请选择您在“<font style="color:#fd6d1f;">{{sceneName}}</font>”演练中的角色：</view>
 	        <view class="role_box"> 
 			   <block class="role-item" v-for="(item,i) in roleList" :key="i">
 				<span  :class="item.choose === 'true' ? 'change_color':''"  @click="chooseRole(item)" v-if="i<3">{{item.name}}</span>
@@ -138,7 +138,7 @@
 }
 .mainwrap3 {
 	top: 0;
-	height: calc(100% - 70px);
+	height: 100%;
 	overflow: hidden;
 }
 
@@ -155,8 +155,12 @@
 	width: 94%;
 }
 
+.contit {
+	margin-left: 2%;
+}
+
 .role_box {
-	margin: 1% 0 2% 4%;
+	margin: 4% 0 2% 2%;
 	width: 96%;
 }
 
@@ -195,7 +199,7 @@
 .startbtn {
 	position: relative;
 	z-index: 1;
-	bottom: 35%;
+	bottom: 40%;
 	width: 100%;
 	height: 30%;
 	background:no-repeat 47.5% center;