修改

修改样式和提示
2023-09-01 09:50:57 +08:00 · 2023-08-18 10:49:19 +08:00 · 2023-08-17 16:22:33 +08:00 · 2023-08-17 15:28:08 +08:00 · 2023-08-17 15:06:14 +08:00 · 2023-08-14 15:59:44 +08:00
7 changed files with 150 additions and 122 deletions
--- a/package.json
+++ b/package.json
@ -1,20 +1,21 @@
 {
-  "name": "yer",
-  "version": "1.0.0",
-  "main": "main.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "uview-ui": "^1.8.4"
-  },
-  "repository": {
-    "type": "git",
-    "url": "http://192.168.16.64:3000/jihan/KindergartenAppletUI.git"
-  },
-  "description": ""
+    "id": "qianziyu-select",
+    "displayName": "基于uview2.x封装的下拉框",
+    "version": "1.2",
+    "description": "公共选择下拉框，基于uview2.x。支持下拉加载、列表搜索、单选｜多选",
+    "keywords": [
+        "下拉",
+        "单选",
+        "多选",
+        "uview"
+    ],
+    "dcloudext": {
+        "category": [
+            "前端组件",
+            "通用组件"
+        ]
+    },
+    "dependencies": {
+        "uview-ui": "^2.0.31"
+    }
 }
-
--- a/pages.json
+++ b/pages.json
@ -9,6 +9,21 @@
 				"navigationBarTitleText": "",
 				"navigationBarBackgroundColor": "#D7EEE8"
 			}
+
+		}, {
+			"path": "pages/prescription/prescription",
+			"style": {
+				"navigationBarTitleText": "体质评估运动处方",
+				"navigationBarTextStyle": "white", // 标题的字体颜色
+				"navigationBarBackgroundColor": "#37A97B"
+			}
+
+		}, {
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#D7EEE8"
+			}
 		}, {
 			"path": "pages/Parentinformation/Parentinformation",
 			"style": {
@ -17,28 +32,18 @@
 				// "navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#D7EEE8" //
 			}
-		}, {
-			"path": "pages/prescription/prescription",
-			"style": {
-				"navigationBarTitleText": "体质评估运动处方",
-				"navigationBarTextStyle": "white", // 标题的字体颜色
-				"navigationBarBackgroundColor": "#37A97B"
-			}
-		}, {
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#D7EEE8"
-			}
+
 		},
 		{
 			"path": "pages/Personal/Personal",
 			"style": {
 				"navigationBarTitleText": "",
 				// "enablePullDownRefresh": false,
+				// "enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#D7EEE8" //背景颜色
 			}
+
 		}, {
 			"path": "pages/grade/grade",
 			"style": {
@ -46,7 +51,9 @@
 				// "enablePullDownRefresh": false,
 				// "navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#D7EEE8" //背景颜色
+
 			}
+
 		}, {
 			"path": "pages/home/home",
 			"style": {
@ -56,14 +63,28 @@
 				// "enablePullDownRefresh": false,
 			}
 		},
+		{
+			"path": "pages/add/add",
+			"style": {
+				// "navigationBarTitleText": "新增学生信息",
+				// "navigationStyle": "custom",
+				"navigationBarBackgroundColor": "#37A97B",
+				"navigationBarTextStyle": "white" // 标题的字体颜色
+			
+			}
+		},
 		{
 			"path": "pages/Viewprescription/Viewprescription",
 			"style": {
 				"navigationBarTitleText": "体质评估运动处方",
 				"navigationBarBackgroundColor": "#37A97B",
 				"navigationBarTextStyle": "white" // 标题的字体颜色
+
 			}
+
+
 		}
+
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
--- a/pages/Parentinformation/Parentinformation.vue
+++ b/pages/Parentinformation/Parentinformation.vue
@ -76,7 +76,7 @@
 					</view>
 				</view>
 				<view class="btns">
-					<view class="btn1" @tap='maskshow=false'>取消</view>
+					<view class="btn1" @tap='cancellist'>取消</view>
 					<view class="btn2" @tap='checkeds'>阅读并同意</view>
 				</view>
 			</view>
@ -116,6 +116,10 @@
 			this.data.openId = options.openId
 		},
 		methods: {
+			cancellist(){
+				this.checked = false;
+				this.maskshow = false
+			},
 			//点击隐私保护的确定
 			checkeds() {
 				this.checked = true;
@ -156,6 +160,7 @@
 			},
 			//取消按钮
 			cancel() {
+				this.maskshow=false
 				uni.navigateTo({
 					url: '/pages/index/index'
 				})
@ -165,6 +170,9 @@
 </script>

 <style lang="scss">
+	.btns{
+		display: flex;
+	}
 	.text {
 		margin-top: 40rpx;
 		padding-bottom: 80rpx;
@ -172,12 +180,15 @@

 	.btn1,
 	.btn2 {
-		width: 50%;
-		height: 80rpx;
-		line-height: 80rpx;
+		width: 254rpx;
+		margin-left: 5%;
+		margin-bottom: 5%;
+		height: 69rpx;
+		background: #F4F5F9;
+		border-radius: 10rpx;
+		line-height: 69rpx;
+		font-size: 28rpx;
 		text-align: center;
-		display: inline-block;
-		background-color: #fff;
 	}

 	.btn2 {
@ -224,6 +235,17 @@
 		padding: 5% 0 0 0;
 		position: relative;

+		.cancel {
+			width: 254rpx;
+			margin-left: 5%;
+			height: 69rpx;
+			background: #F4F5F9;
+			border-radius: 10rpx;
+			line-height: 69rpx;
+			font-size: 28rpx;
+			text-align: center;
+		}
+
 		.top {
 			width: 95%;
 			margin: 0 auto 0;
@ -239,16 +261,7 @@
 				display: flex;
 				left: 10%;

-				.cancel {
-					width: 254rpx;
-					margin-left: 5%;
-					height: 69rpx;
-					background: #F4F5F9;
-					border-radius: 10rpx;
-					line-height: 69rpx;
-					font-size: 28rpx;
-					text-align: center;
-				}
+

 				.submit {
 					width: 254rpx;
@ -460,4 +473,4 @@
 			}
 		}
 	}
-</style>
+</style>
--- a/pages/Personal/Personal.vue
+++ b/pages/Personal/Personal.vue
@ -26,9 +26,9 @@
 			<view class="studentitem">
 				<image src="../../static/renshi.png" mode=""></image>
 				<span>学生信息</span>
-				<view class="added"  v-if="parentList" @tap="additem">
+				<!-- <view class="added"  v-if="parentList" @tap="additem">
 					新增
-				</view>
+				</view> -->
 			</view>
 			<view class="backgrounditem" v-if="!parentList">
 				<view class="picitem">
@ -52,9 +52,9 @@
 				<view class="sex">所属幼儿园:
 					<span>{{item.kindergartenName}}</span>
 				</view>
-				<span class="update" @tap="getStudent(item)">
+				<!-- <span class="update" @tap="getStudent(item)">
 					修改
-				</span>
+				</span> -->
 			</view>
 		</view>
 		<view class="school" v-if="!parentList">
@ -136,24 +136,24 @@
 			} else {}
 		},
 		methods: {
-			getStudent(item){
-				console.log(item,'99')
-				uni.navigateTo({
-					url: `/pages/add/add?studentId=${item.studentId}`
-				})
+			// getStudent(item){
+			// 	console.log(item,'99')
+			// 	uni.navigateTo({
+			// 		url: `/pages/add/add?studentId=${item.studentId}`
+			// 	})
 				
 				
-			},
+			// },
 			goindex(){
 				uni.navigateTo({
 					url: "/pages/index/index"
 				})
 			},
-			additem(){
-				uni.navigateTo({
-					url: "/pages/add/add"
-				})
-			},
+			// additem(){
+			// 	uni.navigateTo({
+			// 		url: "/pages/add/add"
+			// 	})
+			// },
 			getInfoByPhoneinfo() {
 				var that = this
 				getInfoByPhone(this.phone).then(res => {
--- a/pages/Viewprescription/Viewprescription.vue
+++ b/pages/Viewprescription/Viewprescription.vue
@ -441,7 +441,7 @@
 					}

 					.bindtitle {
-						width: 500rpx;
+						width: 470rpx;
 						height: 50rpx;
 						line-height: 70rpx;
 						font-size: 24rpx;
--- a/pages/add/add.vue
+++ b/pages/add/add.vue
@ -37,7 +37,8 @@
 			<u--input v-model="form.studentNumber" placeholder="请输入学生编号" border="none"></u--input>
 		</u-form-item>
 		<u-form-item label="证件编号:" prop="cardNumber" borderBottom ref="item1">
-			<u--input v-model="form.cardNumber" placeholder="请输入证件编号" border="none" maxlength="18"></u--input>
+			<u--input v-model="form.cardNumber" @input="TypeInput($event)" type="number" placeholder="请输入证件编号"
+				border="none" maxlength="18"></u--input>
 		</u-form-item>
 		<u-form-item label="曾用名:" prop="onceName" borderBottom ref="item1">
 			<u--input v-model="form.onceName" placeholder="请输入曾用名" border="none"></u--input>
@ -53,7 +54,7 @@
 		</view>

 		<u-form-item label="学生性别:" borderBottom>
-			<u-radio-group v-model="studentSex" @change="groupChange">
+			<u-radio-group v-model="form.studentSex" @change="groupChange">
 				<u-radio :customStyle="{marginBottom: '4px'}" v-for="(item, index) in radiolist1" :key="index"
 					:label="item.name" :name="item.name" @change="radioChange">
 				</u-radio>
@ -107,7 +108,6 @@
 					studentSex: '',
 					className: '',
 				},
-				studentSex: '',
 				rules: {
 					'birthDate': {
 						type: 'string',
@ -148,12 +148,12 @@
 				});
 				this.studentId = options.studentId
 				getStudent(this.studentId).then(res => {
-					if (res.data.studentSex == 'MALE') {
-						this.studentSex = '男'
-					} else if (res.data.studentSex == 'FEMALE') {
-						this.studentSex = '女'
-					}
 					this.form = res.data
+					if (res.data.studentSex == 'MALE') {
+						this.form.studentSex = '男'
+					} else if (res.data.studentSex == 'FEMALE') {
+						this.form.studentSex = '女'
+					}
 					this.form.parentName = res.data.parentName

 				})
@ -181,6 +181,15 @@

 		},
 		methods: {
+			// 身份证限制数字格式
+			TypeInput(e, val) {
+				// 只能输入数字的验证;
+				var inputType = /[\W]/g; //想限制什么类型在这里换换正则就可以了
+				this.$nextTick(function() {
+					this.form.cardNumber = e.replace(inputType, '');
+				})
+			},
+			// 取消
 			ontouchcancel() {
 				uni.reLaunch({
 					url: "/pages/Personal/Personal"
@ -194,7 +203,7 @@

 				})
 			},
-
+			// 性别
 			groupChange(n) {
 				if (n == '男') {
 					this.form.studentSex = 'MALE'
@ -215,6 +224,11 @@
 			},
 			//提交
 			submitend() {
+				if(this.form.studentSex=='男'){
+					this.$set(this.form,'studentSex','MALE')
+				}else if(this.form.studentSex=='女'){
+					this.$set(this.form,'studentSex','FEMALE')
+				}
 				if (!this.form.kindergartenName) {
 					this.$refs.uToast.show({
 						message: "请选择所属幼儿园",
@ -227,43 +241,34 @@
 						type: 'error',
 						duration: '2000'
 					})
-				}
-
-				this.$refs.uForm.validate().then(res => {
-					// uni.$u.toast('校验通过')
-					updateStudent(this.form).then(res => {
-						if (res.code == 200) {
-							this.$refs.uToast.show({
-								message: "提交成功",
-								type: 'success',
-								duration: '2000'
-							})
-							setTimeout(e => {
-								uni.reLaunch({
-									url: '/pages/Personal/Personal'
+				}else{
+					this.$refs.uForm.validate().then(res => {
+						// uni.$u.toast('校验通过')
+						updateStudent(this.form).then(res => {
+							if (res.code == 200) {
+								this.$refs.uToast.show({
+									message: "提交成功",
+									type: 'success',
+									duration: '2000'
 								})
-							}, 1000)
-
-						} else if (res.code == 500) {
-
-							uni.showToast({
-								title: res.msg,
-								duration: 2000,
-								mask: true,
-								icon: 'none'
-							})
-						}
+								setTimeout(e => {
+									uni.reLaunch({
+										url: '/pages/Personal/Personal'
+									})
+								}, 1000)
+					
+							} else if (res.code == 500) {
+								this.$refs.uToast.show({
+									message: res.msg,
+									type: 'error',
+									duration: '2000'
+								})
+							}
+						})
+					}).catch(errors => {
 					})
-				}).catch(errors => {
-					uni.showToast({
-						title: errors,
-						duration: 2000,
-						mask: true,
-						icon: 'none'
-					})
-				})
-				// }
-
+				}
+			

 			},

@ -392,8 +397,7 @@
 		position: absolute;
 		left: 54%;
 		color: white;
-		background-color: #D7EEE8;
-		// bottom: 5%;
+		background-color: #35A97A;
 	}

 	.submit {
@ -406,7 +410,6 @@
 		position: absolute;
 		left: 20%;
 		color: white;
-		// bottom: 5%;
 		background-color: #35A97A;
 	}

@ -419,15 +422,6 @@
 		margin-left: 10% !important;
 	}

-
-	// ::v-deep .bindtitle {
-	// ::v-deep .input-inner {
-	// 	// color: #fff!important;
-	// 	font-size: 5rpx !important;
-	// }
-
-
-
 	::v-deep .u-input {
 		font-size: 5rpx !important;
 	}
@ -453,7 +447,6 @@
 	::v-deep .uni-data-select {
 		z-index: 9999 !important;
 		height: 200rpx !important;
-		/* background: red; */
 		overflow: auto;
 	}
 </style>
--- a/pages/prescription/prescription.vue
+++ b/pages/prescription/prescription.vue
@ -515,7 +515,7 @@
 					}

 					.bindtitle {
-						width: 500rpx;
+						width: 470rpx;
 						height: 50rpx;
 						line-height: 70rpx;
 						font-size: 24rpx;
Author	SHA1	Message	Date
闫晓茹	611dc20625	修改	2023-09-01 09:50:57 +08:00
闫晓茹	ef1a85e88e	修改	2023-08-18 10:49:19 +08:00
闫晓茹	252e181057	修改样式和提示	2023-08-17 16:22:33 +08:00
闫晓茹	c0318072e4	同意	2023-08-17 15:28:08 +08:00
闫晓茹	efc725c786	取消按钮颜色	2023-08-17 15:06:14 +08:00
闫晓茹	6c331a5293	修改	2023-08-14 15:59:44 +08:00
闫晓茹	44e7d2e4ae	修改	2023-08-07 10:41:51 +08:00
闫晓茹	806c6d184d	修改	2023-08-07 10:39:49 +08:00
闫晓茹	5316056a36	修改	2023-08-07 10:19:59 +08:00
闫晓茹	9022873a6f	修改身份证只能输数字	2023-08-04 15:24:10 +08:00