From b1da38edef3c8cb36024a93baa9a75cdf6bd3b56 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 22 Jan 2024 14:19:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E7=BA=A6=E6=8F=90=E7=A4=BA=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/homepage/homepage.vue             | 15 ++++-
 pagesC/Onlinesigning/Onlinesigning.scss |  5 ++
 pagesC/Onlinesigning/Onlinesigning.vue  | 90 ++++++++++++++-----------
 3 files changed, 70 insertions(+), 40 deletions(-)

diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index dd1076d..1022b3c 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -171,7 +171,7 @@
 				this.$refs.uToast.show({
 					title: '当前绑定地市不支持',
 					type: 'error',
-					duration: '3000',
+					duration: '1500',
 				})
 			},
 			// 家医签约
@@ -189,11 +189,13 @@
 									this.$refs.uToast.show({
 										title: '未签约，请先签约',
 										type: 'error',
+										duration:'1500',
 										url: "/pagesC/Onlinesigning/Onlinesigning"
 									})
 								} else if (this.checkSign == "01") {
 									this.$refs.uToast.show({
 										title: this.infotitle,
+										duration:'1500',
 										type: 'error',
 									})
 								} else {
@@ -221,12 +223,14 @@
 								this.$refs.uToast.show({
 									title: this.infotitle,
 									type: 'error',
+									duration:'1500',
 									url: "/pagesC/Onlinesigning/Onlinesigning"
 								})
 							} else if (this.checkSign == "01") {
 								this.$refs.uToast.show({
 									title: this.infotitle,
 									type: 'error',
+									duration:'1500',
 								})
 							} else {
 								uni.navigateTo({
@@ -304,11 +308,13 @@
 									this.$refs.uToast.show({
 										title: '未签约，请先签约',
 										type: 'error',
+										duration:'1500',
 										url: "/pagesC/Onlinesigning/Onlinesigning"
 									})
 								} else if (this.checkSign == "01") {
 									this.$refs.uToast.show({
 										title: this.infotitle,
+										duration:'1500',
 										type: 'error',
 									})
 								} else {
@@ -335,13 +341,16 @@
 							if (this.checkSign == "0") {
 								this.$refs.uToast.show({
 									title: '未签约，请先签约',
+									duration:'1500',
 									type: 'error',
+
 									url: "/pagesC/Onlinesigning/Onlinesigning"
 								})
 							} else if (this.checkSign == "01") {
 								this.$refs.uToast.show({
 									title: this.infotitle,
 									type: 'error',
+									duration:'1500',
 								})
 							} else {
 								uni.navigateTo({
@@ -367,12 +376,14 @@
 								this.$refs.uToast.show({
 									title: '未签约，请先签约',
 									type: 'error',
+									duration:'1500',
 									url: "/pagesC/Onlinesigning/Onlinesigning"
 								})
 							} else if (this.checkSign == "01") {
 								this.$refs.uToast.show({
 									title: this.infotitle,
 									type: 'error',
+									duration:'1500',
 								})
 							} else {
 								uni.navigateTo({
@@ -391,4 +402,4 @@
 
 <style lang="scss">
 	@import "./homepage.scss";
-</style>
\ No newline at end of file
+</style>
diff --git a/pagesC/Onlinesigning/Onlinesigning.scss b/pagesC/Onlinesigning/Onlinesigning.scss
index 18dbb1c..2521913 100644
--- a/pagesC/Onlinesigning/Onlinesigning.scss
+++ b/pagesC/Onlinesigning/Onlinesigning.scss
@@ -136,6 +136,11 @@
 			font-weight: 400;
 			color: #333333;
 			line-height: 38rpx;
+			.asterisk{
+				color: red;
+				position: relative;
+				top: 3px;
+			}
 
 			::v-deep .u-input {
 				width: 636rpx;
diff --git a/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue
index 3f158df..4569d97 100644
--- a/pagesC/Onlinesigning/Onlinesigning.vue
+++ b/pagesC/Onlinesigning/Onlinesigning.vue
@@ -19,18 +19,22 @@
 		</view>
 		<view class="contentbottom" v-if="stepnumber==1">
 			<view class="name">
+				<text class="asterisk">*</text>
 				姓名
 				<u-input v-model="query.residentName" :border="true" placeholder="请输入姓名" />
 			</view>
 			<view class="name">
+				<text class="asterisk">*</text>
 				身份证号
 				<u-input v-model="query.identity" :border="true" placeholder="请输入身份证号" />
 			</view>
 			<view class="name">
+				<text class="asterisk">*</text>
 				手机号码
 				<u-input v-model="query.phone" :border="true" placeholder="请输入手机号码" />
 			</view>
 			<view class="name" @tap='countyshow=true'>
+					<text class="asterisk">*</text>
 				现住区县
 				<view class="select">
 					<text v-if="query.countyName" style="font-size: 26rpx;color: #303133;">{{query.countyName}}</text>
@@ -62,6 +66,7 @@
 			<u-select v-model="villageshow" mode="single-column" :list="villagelist" @confirm="villageconfirm"
 				value-name='committeeCode' label-name='name'></u-select>
 			<view class="name">
+				<text class="asterisk">*</text>
 				详细地址
 				<u-input v-model="query.address" :border="true" placeholder="请输入详细地址" />
 			</view>
@@ -71,6 +76,7 @@
 		</view>
 		<view class="contentbottom" v-if="stepnumber==2">
 			<view class="name" @tap='goselectInstitution'>
+				<text class="asterisk">*</text>
 				签约机构
 				<view class="select">
 					<text v-if="query.orgName" style="font-size: 26rpx;color: #303133;">{{query.orgName}}</text>
@@ -79,6 +85,7 @@
 				</view>
 			</view>
 			<view class="name" @tap='gochoosedoctor'>
+				<text class="asterisk">*</text>
 				医生
 				<view class="select">
 					<text v-if="query.userName" style="font-size: 26rpx;color: #303133;">{{query.userName}}</text>
@@ -87,6 +94,7 @@
 				</view>
 			</view>
 			<view class="name" @tap='changeCrowd'>
+				<text class="asterisk">*</text>
 				所属人群
 				<view class="select" style="height: 100%;">
 					<text v-if="query.crowdsName" style="font-size: 26rpx;color: #303133;">{{query.crowdsName}}</text>
@@ -95,6 +103,7 @@
 				</view>
 			</view>
 			<view class="name" @tap='changePackages'>
+				<text class="asterisk">*</text>
 				服务包
 				<view class="select" style="height: 100%;">
 					<text v-if="query.packagesName"
@@ -104,12 +113,14 @@
 				</view>
 			</view>
 			<view class="name">
+				<text class="asterisk">*</text>
 				签约时间
 				<view class="select" style="height: 100%;">
 					<text style="font-size: 26rpx;color: #303133;">{{query.signTime}}</text>
 				</view>
 			</view>
 			<view class="name">
+				<text class="asterisk">*</text>
 				签约周期(年)
 				<u-input v-model="query.signYears" type='number' :border="true" placeholder="请输入签约周期(单位年)" />
 			</view>
@@ -245,43 +256,7 @@
 				}
 			},
 			protocolshowtrue(e) {
-				if (!this.query.residentName) {
-					this.$refs.uToast.show({
-						title: '请输入名字',
-						type: 'error',
-					})
-				} else if (!this.query.identity) {
-					this.$refs.uToast.show({
-						title: '请输入身份证号',
-						type: 'error',
-					})
-				} else if (!this.query.phone) {
-					this.$refs.uToast.show({
-						title: '请输入手机号',
-						type: 'error',
-					})
-				} else if (!this.query.countyName) {
-					this.$refs.uToast.show({
-						title: '请选择现住区县',
-						type: 'error',
-					})
-					// }
-					// else if (!this.query.townName) {
-					// 	this.$refs.uToast.show({
-					// 		title: '请选择乡镇/街道',
-					// 		type: 'error',
-					// 	})
-					// } else if (!this.query.committeeName) {
-					// 	this.$refs.uToast.show({
-					// 		title: '请选择村/社区',
-					// 		type: 'error',
-					// 	})
-				} else if (!this.query.address) {
-					this.$refs.uToast.show({
-						title: '请输入详细地址',
-						type: 'error',
-					})
-				} else if (!this.query.orgName) {
+				if (!this.query.orgName) {
 					this.$refs.uToast.show({
 						title: '请选择签约机构',
 						type: 'error',
@@ -420,7 +395,46 @@
 				} else if (val == 2) {
 					this.stepnumber = 2
 				} else if (val == '+') {
-					this.stepnumber++
+					if (!this.query.residentName) {
+						this.$refs.uToast.show({
+							title: '请输入名字',
+							type: 'error',
+						})
+					} else if (!this.query.identity) {
+						this.$refs.uToast.show({
+							title: '请输入身份证号',
+							type: 'error',
+						})
+					} else if (!this.query.phone) {
+						this.$refs.uToast.show({
+							title: '请输入手机号',
+							type: 'error',
+						})
+					} else if (!this.query.countyName) {
+						this.$refs.uToast.show({
+							title: '请选择现住区县',
+							type: 'error',
+						})
+						// }
+						// else if (!this.query.townName) {
+						// 	this.$refs.uToast.show({
+						// 		title: '请选择乡镇/街道',
+						// 		type: 'error',
+						// 	})
+						// } else if (!this.query.committeeName) {
+						// 	this.$refs.uToast.show({
+						// 		title: '请选择村/社区',
+						// 		type: 'error',
+						// 	})
+					} else if (!this.query.address) {
+						this.$refs.uToast.show({
+							title: '请输入详细地址',
+							type: 'error',
+						})
+					}else{
+						this.stepnumber++
+					}
+					
 				} else if (val == '-') {
 					this.stepnumber--
 				}