Merge branch 'zxrapp' into 'master'

6.26张祥瑞

See merge request cxcxt/jeecguniapp!20

src/pages-politics/healthfollow/lookhealth.vue

@@ -5,7 +5,7 @@
 				<wd-col :span="16">
 					<wd-datetime-picker type="year-month" v-model="dataValue" label="填报时间" @confirm="getList" id="top1" />
 				</wd-col>
-				<wd-col :span="8" style="display: flex; justify-content: center;">
+				<wd-col :span="8" style="margin-top: 5px;">
 					<wd-button @click="clear">重置</wd-button>
 				</wd-col>
 			</wd-row>

src/pages-politics/healthfollow/send.vue

@@ -1,13 +1,13 @@
 <template>
 	<PageLayout :navbarShow="false">
-		<wd-card style="margin: 10px; display: flex; justify-content: center; align-items: center;" id="top1">
+		<wd-card  id="top1">
 			<wd-row>
-				<wd-col :span="12" style="display: flex; justify-content: center;">
+				<wd-col :span="16" style="margin-top: 5px;">
 					<uni-easyinput v-model="realname" placeholder="姓名模糊查询" @change="getpersonList"
-						@clear="getpersonList" />
+						@clear="getpersonList" style="width: 100%;" />
 				</wd-col>
-				<wd-col :span="12" style="display: flex; justify-content: center;">
-					<wd-button @click="sendMessage">发送消息</wd-button>
+				<wd-col :span="6" style="margin-top: 5px;margin-left: 3px;">
+					<wd-button @click="sendMessage" style="width: 100%;">发送消息</wd-button>
 				</wd-col>
 			</wd-row>
 		</wd-card>
@@ -48,6 +48,8 @@
 	const screenHeight = ref(0)
 	const screenWidth = ref(0)
 	const tableHeight = ref(0)
+	const message = useMessage()
+	const toast = useToast()
 
 	const getpersonList = (e) => {
 		if (e != 1) { //为1时是切换页码
@@ -82,7 +84,7 @@
 		const selectedData = list.value.filter(item => item.checked);
 
 		if (selectedData.length === 0) {
-			useToast().show('请先选择要发送消息的人员');
+			toast.success('请先选择要发送消息的人员')
 			return;
 		}
 		// 收集所有选中项的 ldhth 字段并以逗号拼接
@@ -91,7 +93,12 @@
 		addByCld({
 			ldhths:ldhthValues
 			}).then(res=>{
+				toast.success(res.message)
 				console.log("res----",res)
+				// if(res.success){
+				// 	toast.success(res.message)
+				// }
+				
 			})