修改bug,还有微型消防站新增人员的样式

pagesA/fire/check_active/add_check/add_check.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container uni-container">
-		<view class="example">
+		<view class="example container" :style="'height: ' + (screenHeight - wheight - 75) + 'px'">
 			<!-- 自定义表单校验 1-->
 			<u--form ref="customForm" :model="formData" labelPosition="left" labelWidth="70" labelAlign="right">
 				<view class=" flex  flex-direction ">
@@ -59,13 +59,12 @@
 					<uni-col :span="24">
 						<!-- 		<u-modal :show="show" :title="title" :content='content' :asyncClose="true" @cancel="cancel"
 							@confirm="confirm" :showCancelButton='true' :showConfirmButton='true'></u-modal> -->
-						<u-button @click="submit('customForm')" type="primary" color="#4CB2B6" shape="circle"
-							size="default" text="暂存"></u-button>
 						<u-modal :show="showNew" title="已存入草稿箱,是否立即发布" @confirm="sureNew" @cancel="cancelNew"
 							:showCancelButton='true' :showConfirmButton='true'></u-modal>
 					</uni-col>
 				</uni-row>
 			</u--form>
+
 			<!-- 多选closeable closeOnClickOverlay--点击遮罩层不可关闭所属单位的弹出内容选中 ，选择单位-->
 			<u-popup :show="checkboxShow2" :round="10" @close="checkboxShow2=false" style="position: relative;">
 				<!-- 	<view class="u-page__tag-item">
@@ -208,6 +207,10 @@
 			</u-popup>
 			<!-- <image :src="jiezhiTime" mode="heightFix" style="width: 20px;height: 20px;"></image> -->
 		</view>
+		<uni-row class="heigthButton">
+			<u-button @click="submit('customForm')" type="primary" color="#4CB2B6" shape="circle"
+				size="default" text="暂存"></u-button>
+		</uni-row>
 	</view>
 </template>
 <script>
@@ -239,6 +242,7 @@
 	export default {
 		data() {
 			return {
+				screenHeight: this.$screenHeight,
 				wheight: '',
 				keyword: '',
 				list3Jia: [{
@@ -351,6 +355,13 @@
 				immediate: true
 			}
 		},
+		mounted() {
+			const query = uni.createSelectorQuery().in(this)
+			const thisNode = query.select('.heigthButton')
+			thisNode.boundingClientRect(data => {
+				this.wheight = data.height
+			}).exec()
+		},
 		// 在 vue页面，向起始页通过事件传递数据
 		onLoad: function(option) {
 			this.formDataChuangMu.taskType = option.type
@@ -660,14 +671,14 @@
 				}
 				this.timeoutId = setTimeout(function() {
 					//节流
-					_this.scrollHeight = e.detail.scrollTop + 1 + _this.height/7;
+					_this.scrollHeight = e.detail.scrollTop + 1 + _this.height / 7;
 					//+1不要删除，解决最后一项某种情况下翻到底部，左边按钮并不会切换至最后一个
 					//若想使切换参考线为屏幕顶部请删除 _this.height/2
 					for (let i = 0; i < _this.arr.length; i++) {
 						let height1 = _this.arr[i];
 						let height2 = _this.arr[i + 1];
 						if (!height2 || (_this.scrollHeight >= height1 && _this.scrollHeight < height2)) {
-							_this.categoryActive =i;
+							_this.categoryActive = i;
 							_this.diff > 0 && (_this.scrollLeftTop = Math.round((_this.categoryActive * _this
 								.diff) / (this.list.length - 1)));
 							return false;
@@ -1128,4 +1139,8 @@
 	.box:last-child {
 		padding-bottom: 354rpx;
 	}
+	
+	.example {
+		overflow-y: auto;
+	}
 </style>

pagesA/fire/check_inspection/inspect_detail/inspect_detail.vue

@@ -4,8 +4,8 @@
 		<view class="bgTopImg">
 			<image slot="right" :src="`${urls}/navBg@2x.png`" class="bgTopImg"></image>
 		</view>
-		<view class="  uni-container">
-			<view class=" flex  flex-direction width100">
+		<view class="uni-container">
+			<view class="flex  flex-direction width100">
 				<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
 				<u--form ref="uForm" :model="formData" labelPosition="left" labelWidth="90" labelAlign="left">
 					<view class="">

pagesA/fire/fire_station/add_fireStation/add_fireStation.vue

@@ -513,7 +513,7 @@
 	}
 
 	.manyBtn {
-		width: 150rpx;
+		// width: 150rpx;
 		height: 60rpx;
 		font-size: 20rpx;
 		line-height: 60rpx;
@@ -521,5 +521,6 @@
 		border-radius: 20rpx;
 		background-color: #4DB1B6;
 		color: white;
+		margin-left: 20px;
 	}
 </style>

pagesA/fire/fire_station/people_fireStation/people_fireStation.vue

@@ -1,108 +1,116 @@
 <template>
-	<view style="position: relative;">
+	<view>
 		<navInfo :title="'编辑人员'"></navInfo>
-		<view class="bgTopImg" style="height:200rpx;">
+		<view class="bgTopImg" style="height:200rpx;position: fixed;z-index: 9;">
 			<image slot="right" class="bgTopImg"></image>
 		</view>
-		<div class="cardBox">
-			<uni-card v-for="item in tableList" style="border: 2rpx solid #4DB1B6;">
-				<div style="display: flex;justify-content: space-between;align-items: center;">
-					<div>
-						<text>姓名：{{item.empName}}</text><br>
-						<text>电话：{{ item.mobile }}</text><br>
-						<text>身份证号：{{item.idcardno}}</text><br>
-						<text>职务：{{getDuty(item.empType)}}</text>
-					</div>
-					<div style="display: flex;justify-content: space-around;align-items: center;">
-						<button @click="delUser(item)" class="editBtn" style="background-color: red;">删除</button>
-						<button @click="editUser(item)" class="editBtn">编辑</button>
-					</div>
-				</div>
-			</uni-card>
-		</div>
-		<!-- 新增的人员表单项 -->
-		<div v-for="(person, index) in membersList" :key="index"
-			style="border-bottom: 1px solid black;margin-top: 100rpx;">
-			<u--form ref="forms">
-				<u-form-item class="typeStyle" :prop="'name' + (index + 1)">
-					<p style="width: 150rpx;margin-left: 20rpx;">姓名</p>
-					<u-input v-model="person.name" id="nameId" @change="nameBlur" :placeholder="'请输入姓名'" />
-					<span class="erroring" v-if="nameRules">请输入名称</span>
-				</u-form-item>
-				<u-form-item class="typeStyle" :prop="'age' + (index + 1)">
-					<p style="width: 150rpx;margin-left: 20rpx;">身份证号</p>
-					<u-input @change="userBlur" v-model="person.userNum" :placeholder="'请输入身份证号'" />
-					<span class="erroring" v-if="userRules">身份证号有误</span>
-				</u-form-item>
-				<!-- 其他人员信息字段 -->
-				<u-form-item class="typeStyle" :prop="'age' + (index + 1)">
-					<p style="width: 150rpx;margin-left: 20rpx;">电话号</p>
-					<u-input v-model="person.phone" @change="phoneBlur" :placeholder="'请输入电话号'" />
-					<span class="erroring" v-if="phoneRules">电话号有误</span>
-				</u-form-item>
-				<!-- <u-form-item class="typeStyle" :prop="'age' + (index + 1)">
+		<view class="uni-container">
+			<view class=" flex  flex-direction width100">
+				<view class="cardBox">
+					<uni-card v-for="item in tableList" style="border: 2rpx solid #4DB1B6;">
+						<view style="display: flex;justify-content: space-between;align-items: center;">
+							<view>
+								<text>姓名：{{item.empName}}</text><br>
+								<text>电话：{{ item.mobile }}</text><br>
+								<text>身份证号：{{item.idcardno}}</text><br>
+								<text>职务：{{getDuty(item.empType)}}</text>
+							</view>
+							<view style="display: flex;justify-content: space-around;align-items: center;">
+								<button @click="delUser(item)" class="editBtn"
+									style="background-color: red;">删除</button>
+								<button @click="editUser(item)" class="editBtn">编辑</button>
+							</view>
+						</view>
+					</uni-card>
+				</view>
+				<!-- 新增的人员表单项 -->
+				<view v-for="(person, index) in membersList" :key="index" style="border-bottom: 1px solid #f8f8f8;">
+					<u--form ref="forms" labelPosition="left" labelWidth="150" labelAlign="left">
+						<u-form-item class="typeStyle" :prop="'name' + (index + 1)">
+							<p style="width: 150rpx;margin-left: 20rpx;">姓名</p>
+							<u-input v-model="person.name" id="nameId" @change="nameBlur" :placeholder="'请输入姓名'" />
+							<span class="erroring" v-if="nameRules">请输入名称</span>
+						</u-form-item>
+						<u-form-item class="typeStyle" :prop="'age' + (index + 1)">
+							<p style="width: 150rpx;margin-left: 20rpx;">身份证号</p>
+							<u-input @change="userBlur" v-model="person.userNum" :placeholder="'请输入身份证号'" />
+							<span class="erroring" v-if="userRules">身份证号有误</span>
+						</u-form-item>
+						<!-- 其他人员信息字段 -->
+						<u-form-item class="typeStyle" :prop="'age' + (index + 1)">
+							<p style="width: 150rpx;margin-left: 20rpx;">电话号</p>
+							<u-input v-model="person.phone" @change="phoneBlur" :placeholder="'请输入电话号'" />
+							<span class="erroring" v-if="phoneRules">电话号有误</span>
+						</u-form-item>
+						<!-- <u-form-item class="typeStyle" :prop="'age' + (index + 1)">
 					<p style="width: 150rpx;margin-left: 20rpx;">人员类型</p>
 					<u-input v-model="person.worker" :placeholder="'请输入人员类型'" />
 				</u-form-item> -->
-				<u-form-item class="antherStyle">
-					<p style="width: 150rpx;">人员类型</p>
-					<uni-data-select v-model="person.power" :localdata="selectType" @change="change"></uni-data-select>
-					<!-- <uni-data-select v-model="person.worker" :localdata="range" @change="change"></uni-data-select> -->
-				</u-form-item>
-				<u-form-item>
-					<u-button type="primary" @click="addSure" class="antherBtn">提交</u-button>
-					<u-button type="primary" @click="cleanList" class="antherBtn">取消</u-button>
-				</u-form-item>
-			</u--form>
-		</div>
-		<div>
-			<u-popup :show="showModal" mode="center" @close="closeModal" :round="10">
-				<view class="modalBox">
-					<u--form labelPosition="left" :model="formbox" ref="uForm" style="width: 100%;">
-						<u-form-item style="width: 400rpx;" label="姓名" prop="formbox.fname" borderBottom ref="item1">
-							<u--input class="insides" v-model="formbox.fname" border="none"></u--input>
+						<u-form-item class="antherStyle">
+							<p style="width: 150rpx;">人员类型</p>
+							<uni-data-select v-model="person.power" :localdata="selectType"
+								@change="change"></uni-data-select>
+							<!-- <uni-data-select v-model="person.worker" :localdata="range" @change="change"></uni-data-select> -->
 						</u-form-item>
-						<u-form-item style="width: 350rpx;" label="电话号" prop="formbox.fphone" borderBottom ref="item1">
-							<u--input class="insides" v-model="formbox.fphone" border="none"></u--input>
-						</u-form-item>
-						<u-form-item style="width: 490rpx;" label="人员类型" prop="formbox.fpower" borderBottom ref="item1">
-							<uni-data-select v-model="formbox.fpower" :localdata="selectType"
-								@change="change1"></uni-data-select>
-						</u-form-item>
-						<u-form-item style="width: 350rpx;" label="身份证号" prop="userInfo.fuserNum" borderBottom
-							ref="item1">
-							<u--input class="insides" v-model="formbox.fuserNum" border="none"></u--input>
+						<u-form-item>
+							<u-button type="primary" @click="addSure" class="antherBtn">提交</u-button>
+							<u-button type="primary" @click="cleanList" class="antherBtn">取消</u-button>
 						</u-form-item>
-						<!-- 		<u-form-item style="width: 350rpx;" label="人员类型" prop="userInfo.fworker" borderBottom
+					</u--form>
+				</view>
+				<view>
+					<u-popup :show="showModal" mode="center" @close="closeModal" :round="10">
+						<view class="modalBox">
+							<u--form labelPosition="left" :model="formbox" ref="uForm" labelWidth="100"
+								labelAlign="left">
+								<u-form-item label="姓名" prop="formbox.fname" borderBottom ref="item1">
+									<u--input class="insides" v-model="formbox.fname" border="none"></u--input>
+								</u-form-item>
+								<u-form-item label="电话号" prop="formbox.fphone" borderBottom ref="item1">
+									<u--input class="insides" v-model="formbox.fphone" border="none"></u--input>
+								</u-form-item>
+								<u-form-item label="人员类型" prop="formbox.fpower" borderBottom ref="item1">
+									<uni-data-select v-model="formbox.fpower" :localdata="selectType"
+										@change="change1"></uni-data-select>
+								</u-form-item>
+								<u-form-item label="身份证号" prop="userInfo.fuserNum" borderBottom ref="item1">
+									<u--input class="insides" v-model="formbox.fuserNum" border="none"></u--input>
+								</u-form-item>
+								<!-- 		<u-form-item style="width: 350rpx;" label="人员类型" prop="userInfo.fworker" borderBottom
 							ref="item1">
 							<u--input class="insides" v-model="formbox.fworker" border="none"></u--input>
 						</u-form-item> -->
-					</u--form>
-					<div class="useBox">
-						<button class="antherBtn" @click="makeSureEdit">确认修改</button>
-						
-						<button class="antherBtn" @click="showModal = false">取消</button>
-					</div>
+							</u--form>
+							<view class="useBox">
+								<button class="antherBtn" @click="makeSureEdit">确认修改</button>
+
+								<button class="antherBtn" @click="showModal = false">取消</button>
+							</view>
+						</view>
+					</u-popup>
+				</view>
+				<view>
+					<u-popup :show="showDel" title="确认删除？" mode="center">
+						<view style="width: 400rpx;height: 200rpx;margin: 20rpx 20rpx;">
+							<p style="font-size: 35rpx;color: black;">是否删除该数据项？</p>
+							<p style="font-size: 20rpx;color: gray;">确认删除？</p>
+							<view
+								style="display: flex;justify-content: space-around;align-items: center;margin-top: 40rpx;">
+								<button class="antherBtn" @click="makeSureDel"
+									style="background-color: red;">确认</button>
+								<button class="antherBtn" @click="showDel = false">取消</button>
+							</view>
+						</view>
+					</u-popup>
+				</view>
+				<view>
+					<u-modal :show="show123" @confirm="confirm" @cancel="cancel" @close="close" asyncClose
+						closeOnClickOverlay showCancelButton confirmColor="red" title="是否删除该数据项" content="确认删除？"
+						ref="uModal"></u-modal>
 				</view>
-			</u-popup>
-		</div>
-		<div>
-			<u-popup :show="showDel" title="确认删除？" mode="center">
-				<div style="width: 400rpx;height: 200rpx;margin: 20rpx 20rpx;">
-					<p style="font-size: 35rpx;color: black;">是否删除该数据项？</p>
-					<p style="font-size: 20rpx;color: gray;">确认删除？</p>
-					<div style="display: flex;justify-content: space-around;align-items: center;margin-top: 40rpx;">
-						<button class="antherBtn" @click="makeSureDel" style="background-color: red;">确认</button>
-						<button class="antherBtn" @click="showDel = false">取消</button>
-					</div>
-				</div>
-			</u-popup>
-		</div>
-		<div>
-			<u-modal :show="show123" @confirm="confirm" @cancel="cancel" @close="close" asyncClose closeOnClickOverlay
-				showCancelButton confirmColor="red" title="是否删除该数据项" content="确认删除？" ref="uModal"></u-modal>
-		</div>
-		<button @click="addNewPeople" class="circleBtn">+</button>
+				<button @click="addNewPeople" class="circleBtn">+</button>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -224,9 +232,10 @@
 			},
 
 			addSure() {
+				console.log(this.$route.query.addId, 'this.$route.query.addId');
 				if (this.$route.query.addId) {
 					if (!this.userRules && !this.phoneRules && !this.nameRules) {
-						console.log(this.membersList[0].worker,'988');
+						console.log(this.membersList[0].worker, '988');
 						creatFirePeople({
 							empName: this.membersList[0].name,
 							empType: this.membersList[0].worker,
@@ -499,7 +508,14 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.uni-container {
+		padding: 10px;
+		background: #fff;
+		// z-index: 9999999;
+		position: relative;
+	}
+
 	/deep/ .typeStyle {
 		width: 650rpx !important;
 	}
@@ -512,12 +528,12 @@
 
 	/deep/ .antherBtn {
 		width: 200rpx;
-		height: 50rpx;
+		height: 80rpx;
 		margin-bottom: 30rpx;
 		background-color: #4DB1B6;
 		color: white;
 		text-align: center;
-		line-height: 50rpx;
+		line-height: 80rpx;
 		font-size: 30rpx;
 		border-radius: 20rpx;
 	}
@@ -549,7 +565,7 @@
 	}
 
 	.editBtn {
-		width: 100rpx;
+		width: 120rpx;
 		height: 60rpx;
 		background-color: #4DB1B6;
 		color: white;
@@ -563,7 +579,21 @@
 
 	.modalBox {
 		width: 700rpx;
-		height: 880rpx;
+		height: 750rpx;
+		/deep/.uni-select {
+			width: 100%;
+			height: 50px;
+			border: 1px solid #4DB1B6;
+		}
+		/deep/ .u-line{
+			border:none !important;
+		}
+		/deep/ .uni-input-input{
+			padding: 0 10rpx;
+		}
+		/deep/ .u-form-item__body{
+			width: 90%;
+		}
 	}
 
 	.insides {
@@ -593,18 +623,24 @@
 		line-height: 100rpx;
 		color: white;
 		background-color: #4EB0B5;
-		position: absolute;
-		top: 1300rpx;
-		left: 590rpx;
+		position: fixed;
+		bottom: 20rpx;
+		right: 20rpx;
 	}
 
 	.cardBox {
 		width: 650rpx;
-		margin: 30rpx auto;
+		margin: 100rpx auto 20rpx;
 		border-radius: 30rpx;
 	}
 
 	.u-form-item__body__left {
 		width: 100rpx;
 	}
+
+	/deep/.u-button--primary {
+		border: none
+	}
+
+
 </style>

pagesA/fire/fpd_detection/edit_detection/edit_detection.vue

@@ -53,7 +53,7 @@
 				@close="showInspOption = false" @select="setInsp"></u-action-sheet> -->
 			<!-- ----隐患 -->
 			<u-popup :show="showInspOption" :round="10" @close="showInspOption=false">
-				<view style="width: 70vw;overflow-y: auto;margin-bottom: 80rpx;padding:10px">
+				<view style="width: 70vw;overflow-y: auto;margin-bottom: 80rpx;padding:10px;height: 1000rpx">
 					<text class="text-xl">选择检测项目:</text>
 						<view class="person-forward" style="margin-top: 10px;">
 						<u-checkbox-group placement="column" v-model="checkArr" @change="checkboxChange2"

pagesA/fire/fpd_detection/fpd_detection.vue

@@ -210,10 +210,9 @@
 				getFpdDetectionPage(this.queryParams).then(response => {
 					console.log('res', response);
 					this.total = response.data.total
-					
 					this.tableData = [...this.tableData,...response.data.list]
 					if (response.data) {
-
+						this.loading = false;
 						//对检测结果进行初始化
 						const reArr = getDictDatas(DICT_TYPE.BACKEND_DET_RESULT)
 						// console.log('reArr',reArr);
@@ -299,6 +298,7 @@
 				this.formData.orgName = response.data[0].orgName;
 				this.formData.orgId = response.data[0].dwid;
 				this.tableData = []
+				this.getData();
 				this.search();
 
 			}).catch(err => {
@@ -306,7 +306,7 @@
 				this.$modal.msg(err)
 			})
 			// this.tableData={}
-			// this.getData();
+
 			// this.getData()
 		}
 
@@ -436,7 +436,7 @@
 		font-weight: 600;
 		margin-bottom: 10rpx;
 		color: black;
-		font-size: 32rpx;
+		font-size: 26rpx;
 	}
 
 	.conts {

pagesA/fire/meeting_sign_in/index.vue

@@ -63,21 +63,39 @@
 						<uni-col :span="8">
 							<view class="flex direction-column">
 								<text class="padding-bottom"> 会议类型</text>
-								<text style="font-weight: bold;" class="text-1cut">{{ item.meetingType=='1'?"工作会议":"培训会议" }}</text>
+								<text style="font-weight: bold;"
+									class="text-1cut">{{ item.meetingType=='1'?"工作会议":"培训会议" }}</text>
 							</view>
 						</uni-col>
-						<button class="regsiterBtn" @click="peopleReg(item)"
-							v-if="statusListTran(item.timeStuta)=='进行中'||statusListTran(item.timeStuta)=='未开始'?true:false">报名</button>
-						<!-- <button class="regsiterBtn" @click="onClick(item)">签到</button> -->
-						<button class="regsiterBtn" v-if="statusListTran(item.timeStuta)=='已结束'?true:false" @click="searchMeet(item)">查看</button>
-						<uni-col :span="14">
+						<uni-col :span="6">
+							<view class="flex direction-column" v-if="item.meetingAtt">
+								<text class="padding-bottom"> 会议附件:</text>
+								<!-- #ifdef MP-WEIXIN -->
+								<text style="color:#00a3f4;cursor: pointer;margin-left: 50rpx !important;"
+									@click.native="viewSee(item.meetingAtt)">下载附件</text>
+								<!-- #endif -->
+								<!-- #ifdef H5 -->
+								<a style="color:#00a3f4;cursor: pointer;margin-left: 50rpx !important;"
+									@click="viewSee(item.meetingAtt)">下载附件</a>
+								<!-- #endif -->
+							</view>
+						</uni-col>
+						<uni-col :span="10">
 							<view class="flex direction-column align-end ">
 								<text class="padding-bottom">会议主题</text>
 								<text style="font-weight: bold;" class="text-1cut">{{ item.meetingSubject }}</text>
 							</view>
 						</uni-col>
 					</uni-row>
-
+					<view>
+						<view>
+							<button class="regsiterBtn" @click="peopleReg(item)"
+								v-if="statusListTran(item.timeStuta)=='进行中'||statusListTran(item.timeStuta)=='未开始'?true:false">报名</button>
+							<!-- <button class="regsiterBtn" @click="onClick(item)">签到</button> -->
+							<button class="regsiterBtn" v-if="statusListTran(item.timeStuta)=='已结束'?true:false"
+								@click="searchMeet(item)">查看</button>
+						</view>
+					</view>
 				</u-list-item>
 			</u-list>
 		</view>
@@ -88,6 +106,9 @@
 		getMeeting // 查询会议列表
 	} from '@/api/meeting';
 	import {
+		downSee
+	} from '@/utils/common'
+	import {
 		parseTime // 时间戳转换
 	} from '@/utils/ruoyi';
 	export default {
@@ -151,7 +172,10 @@
 				this.tableData = []
 				this.getData(1)
 			},
-
+	//查看已上传附件
+			viewSee(val) {
+				downSee(val)
+			},
 			// =============获取数据===================s
 			// 获取数据
 			getData(pageNo, value = '') {
@@ -274,7 +298,7 @@
 					url: `/pagesA/fire/metting_regsiter/metting_sigin?metId=${row.id}&metName=${row.meetingName}`
 				})
 			},
-			searchMeet(row){
+			searchMeet(row) {
 				uni.navigateTo({
 					url: `/pagesA/fire/metting_regsiter/metting_sigin?meetSearch=${row.id}`
 				})
@@ -299,7 +323,8 @@
 		background-color: #4DB1B5;
 		font-size: 20rpx;
 		color: white;
+		float: right;
 		border-radius: 30rpx;
-		margin-left: 90rpx;
+		margin-left: 20rpx;
 	}
 </style>

pagesA/fire/metting_regsiter/metting_sigin.vue

@@ -10,8 +10,10 @@
 							<text>职务: {{item.ppDuty}}</text>
 						</div>
 						<div style="display: flex;justify-content: space-around;align-items: center;">
-							<button @click="delUser(item)" class="editBtn" style="background-color: red;" v-if="ifMeet">删除</button>
 							<button @click="editUser(item)" class="editBtn" v-if="ifMeet">编辑</button>
+							<button @click="delUser(item)" class="editBtn" style="background-color: red;"
+								v-if="ifMeet">删除</button>
+
 						</div>
 					</div>
 				</uni-card>
@@ -57,7 +59,7 @@
 				</u--form>
 			</div>
 			<div>
-				<u-popup :show="showModal" mode="center" @close="closeModal">
+				<u-popup :show="showModal" mode="center" @close="closeModal" class="popup-box">
 					<view class="modalBox">
 						<u--form labelPosition="left" :model="modalList" ref="uForm">
 							<u-form-item style="width: 500rpx;" prop="modalList.name" borderBottom ref="item1">
@@ -77,7 +79,7 @@
 								<u--input class="modalInput" v-model="modalList.mstatus" border="none"></u--input>
 							</u-form-item> -->
 						</u--form>
-						<div style="display: flex;justify-content: space-around;align-items: center;">
+						<div style="display: flex;justify-content: space-around;align-items: center;margin-top: 20rpx;">
 							<button class="useBtn" @click="sureUpdate">确认修改</button>
 							<button class="useBtn" @click="showModal = false">关闭</button>
 						</div>
@@ -145,7 +147,7 @@
 				showDel: false,
 				makeDelId: "",
 				show123: false,
-				ifMeet:true,
+				ifMeet: true,
 			}
 		},
 		methods: {
@@ -451,7 +453,7 @@
 	}
 
 	.editBtn {
-		width: 100rpx;
+		width: 110rpx;
 		height: 60rpx;
 		background-color: #4DB1B6;
 		color: white;
@@ -459,7 +461,7 @@
 		line-height: 60rpx;
 		border-radius: 10rpx;
 		font-size: 20rpx;
-		margin-right: 5rpx;
+		margin-right: 10rpx;
 		margin-bottom: 10rpx;
 	}
 
@@ -478,8 +480,8 @@
 		color: white;
 		background-color: #4EB0B5;
 		position: absolute;
-		top: 1300rpx;
-		left: 590rpx;
+		bottom: 40rpx;
+		right: 60rpx;
 	}
 
 	.cardBox {
@@ -490,6 +492,7 @@
 
 	.typeStyle {
 		width: 600rpx;
+		
 	}
 
 	.addNewBox {
@@ -507,7 +510,7 @@
 	.mesCard {
 		/* box-shadow: 1 1 1 1 #4DB1B6; */
 		/* background-color: red; */
-		border: 2rpx solid #4DB1B6;
+		box-shadow: 0px 0px 3px 0px rgba(86, 165, 168, 0.63) !important;
 	}
 
 	.noMesBox {
@@ -530,4 +533,21 @@
 		font-size: 30rpx;
 		/* border-radius: 0rpx; */
 	}
+
+	.popup-box {
+		.u-popup__content {
+			border-radius: 10px !important;
+
+			.u-line {
+				border: none !important
+			}
+		}
+       .uni-input-input{
+		   padding: 10px;
+	   }
+	
+	}
+	.u-form{
+		margin-top: 10px;
+	}
 </style>