xg

pagesC/Onlinesigning/Onlinesigning.vue

@@ -124,7 +124,7 @@
 					2.意向签约医生仅供参考，最终签约结果已签约医院确认信 息为准
 				</view>
 			</view>
-			<view class="radio-content" @tap="changeRadio">
+			<view class="radio-content" @tap="protocolshowtrue(1)">
 				<view class="radio-right">
 					<view class="radio" :class="radio == 2 ? 'radio-default':''">
 						<view :class="radio == 2 ? 'radio-active':''"></view>
@@ -135,12 +135,12 @@
 			</view>
 			<view class="submititem">
 				<view class="laststep" @tap="tapstep('-')"> 上一步 </view>
-				<view class="submit" @tap='protocolshowtrue'>
+				<view class="submit" @tap='protocolshowtrue(2)'>
 					提交
 				</view>
 			</view>
 		</view>
-		<u-popup v-model="popupShow" mode="right" @close="closeCrowds" width='50%'>
+		<u-popup v-model="popupShow" mode="right" @close="closeCrowds" width='50%' closeable safe-area-inset-bottom>
 			<scroll-view scroll-y="true" style="height: 100%;padding: 40rpx 10rpx 100rpx">
 				<u-checkbox-group @change="crowdscheckboxGroupChange" v-model="query.crowdsName" v-if="showGroup == 1"
 					label-size='20rpx'>
@@ -154,7 +154,8 @@
 				</u-checkbox-group>
 			</scroll-view>
 		</u-popup>
-		<u-popup v-model="protocolshow" mode="bottom" width='50%' height="70%">
+		<u-popup v-model="protocolshow" mode="bottom" width='50%' height="70%" @close="protocolshowclose" closeable
+			safe-area-inset-bottom>
 			<protocol :list='query' @residentAutographPathlist='residentAutographPath' v-if="protocolshow"></protocol>
 		</u-popup>
 		<u-toast ref="uToast" />
@@ -197,7 +198,7 @@
 				protocolshow: false,
 				radio: '',
 				stepnumber: 1,
-				code:'',
+				code: '',
 				query: {
 					province: '370000000000',
 					provinceName: '山东省',
@@ -238,7 +239,12 @@
 			// }
 		},
 		methods: {
-			protocolshowtrue() {
+			protocolshowclose() {
+				if (this.query.residentAutographPath) {
+					this.radio = 2
+				}
+			},
+			protocolshowtrue(e) {
 				if (!this.query.residentName) {
 					this.$refs.uToast.show({
 						title: '请输入名字',
@@ -259,17 +265,17 @@
 						title: '请选择现住区县',
 						type: 'error',
 					})
-				// }
+					// }
-				// else if (!this.query.townName) {
+					// else if (!this.query.townName) {
-				// 	this.$refs.uToast.show({
+					// 	this.$refs.uToast.show({
-				// 		title: '请选择乡镇/街道',
+					// 		title: '请选择乡镇/街道',
-				// 		type: 'error',
+					// 		type: 'error',
-				// 	})
+					// 	})
-				// } else if (!this.query.committeeName) {
+					// } else if (!this.query.committeeName) {
-				// 	this.$refs.uToast.show({
+					// 	this.$refs.uToast.show({
-				// 		title: '请选择村/社区',
+					// 		title: '请选择村/社区',
-				// 		type: 'error',
+					// 		type: 'error',
-				// 	})
+					// 	})
 				} else if (!this.query.address) {
 					this.$refs.uToast.show({
 						title: '请输入详细地址',
@@ -300,14 +306,7 @@
 						title: '请选择签约周期',
 						type: 'error',
 					})
-				} else if (this.radio != 2) {
-					this.$refs.uToast.show({
-						title: '请先同意并签署服务协议',
-						type: 'error',
-					})
 				} else {
-
-
 					// if (!this.query.county || !this.query.orgNo || !this.query.userName || !this.query.crowdList || this.query
 					// 	.crowdList.length == 0 || !this.query.packageList ||
 					// 	this.query.packageList.length == 0) {
@@ -347,10 +346,19 @@
 							this.query.gender = 99
 						}
 					}
-					if (this.query.residentAutographPath) {
+					if (e == 1) {
-						this.updata();
-					} else {
 						this.protocolshow = true
+					} else {
+						if (this.query.residentAutographPath) {
+							this.updata();
+						} else {
+							this.$refs.uToast.show({
+								title: '请先同意并签署服务协议',
+								type: 'error',
+							})
+							this.protocolshow = true
+							return
+						}
 					}
 				}
 			},
@@ -379,28 +387,21 @@
 							this.query.gender = 99
 						}
 					}
-
 					applysave(this.query).then(res => {
 						if (res.code == 200) {
 							this.$refs.uToast.show({
-								title: '签约成功',
+								title: '申请签约成功',
 								type: 'success',
 								duration: 1500,
 								back: 1,
-
 							})
-							// uni.switchTab({
-							// 	url: "/pages/homepage/homepage"
-							// })
 						} else {
 							this.$refs.uToast.show({
 								title: '签约失败，请重新签约',
 								type: 'error',
 							})
 						}
-
 					})
-					// }
 				} else {
 					this.$refs.uToast.show({
 						title: '请先同意并签署服务协议',
@@ -448,8 +449,8 @@
 				var region = uni.getStorageSync('region')
 				// 德州
 				if (region == 1) {
-					this.query.city='371400000000'
+					this.query.city = '371400000000'
-					this.query.cityName='德州市'
+					this.query.cityName = '德州市'
 					arealist(code).then(res => {
 						if (list == 'county') {
 							this.countylist = res.data
@@ -461,7 +462,7 @@
 					})
 				} else {
 					this.query.city = 370500000000
-					this.query.cityName='东营市'
+					this.query.cityName = '东营市'
 					arealist(code).then(res => {
 						if (list == 'county') {
 							this.countylist = res.data
@@ -472,7 +473,6 @@
 						}
 					})
 				}
-
 			},
 			//选择医生
 			gochoosedoctor() {
@@ -670,4 +670,4 @@
 </script>
 <style lang="scss">
 	@import "./Onlinesigning.scss";
-</style>
+</style>