在线签约+签约信息提示+图文问诊+地址所在区

pages/homepage/homepage.vue

@@ -186,12 +186,16 @@
 						} else {
 							if (this.region == 1 || this.region == 2) {
 								if (this.checkSign == "0") {
-									this.$refs.uToast.show({
+									uni.navigateTo({
-										title: '未签约，请先签约',
+										url:`/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`,
-										type: 'error',
+
-										duration: '1500',
-										url: "/pagesC/Onlinesigning/Onlinesigning"
 									})
+									// 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,
@@ -220,12 +224,16 @@
 					} else {
 						if (this.region == 1 || this.region == 2) {
 							if (this.checkSign == "0") {
-								this.$refs.uToast.show({
+								uni.navigateTo({
-									title: this.infotitle,
+									url:`/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`,
-									type: 'error',
+
-									duration: '1500',
-									url: "/pagesC/Onlinesigning/Onlinesigning"
 								})
+								// 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,
@@ -305,12 +313,17 @@
 						} else {
 							if (this.region == 1 || this.region == 2) {
 								if (this.checkSign == "0") {
-									this.$refs.uToast.show({
+
-										title: '未签约，请先签约',
+									uni.navigateTo({
-										type: 'error',
+										url:`/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`,
-										duration: '1500',
+
-										url: "/pagesC/Onlinesigning/Onlinesigning"
 									})
+									// 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,
@@ -339,13 +352,16 @@
 					} else {
 						if (this.region == 1 || this.region == 2) {
 							if (this.checkSign == "0") {
-								this.$refs.uToast.show({
+								uni.navigateTo({
-									title: '未签约，请先签约',
+									url:`/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`,
-									duration: '1500',
-									type: 'error',
 
-									url: "/pagesC/Onlinesigning/Onlinesigning"
 								})
+								// 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,
@@ -373,12 +389,16 @@
 					} else {
 						if (this.region == 1 || this.region == 2) {
 							if (this.checkSign == "0") {
-								this.$refs.uToast.show({
+								uni.navigateTo({
-									title: '未签约，请先签约',
+									url:`/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`,
-									type: 'error',
+
-									duration: '1500',
-									url: "/pagesC/Onlinesigning/Onlinesigning"
 								})
+								// 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,
@@ -402,4 +422,4 @@
 
 <style lang="scss">
 	@import "./homepage.scss";
-</style>
+</style>

pages/myinformation/myinformation.vue

@@ -418,11 +418,15 @@
 					} else {
 						if (this.region == 1 || this.region == 2) {
 							if (this.checkSign == "0") {
-								this.$refs.uToast.show({
+								uni.navigateTo({
-									title: '未签约，请先签约',
+									url:`/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`,
-									type: 'error',
+
-									url: "/pagesC/Onlinesigning/Onlinesigning"
 								})
+								// this.$refs.uToast.show({
+								// 	title: '未签约，请先签约',
+								// 	type: 'error',
+								// 	url: "/pagesC/Onlinesigning/Onlinesigning"
+								// })
 							} else if (this.checkSign == "01") {
 								this.$refs.uToast.show({
 									title: this.infotitle,
@@ -587,4 +591,4 @@
 
 <style lang="scss">
 	@import './myinformation.scss'
-</style>
+</style>

pagesB/consultationplatform/consultationplatform.vue

@@ -55,6 +55,9 @@
 		selectDepartmentNoPage,
 		selectHospitalPerson
 	} from '@/api/pagesB/medicine/index.js'
+	import {
+		checkSignApply
+	} from '@/api/pages/homepage/homepage.js'
 	import baseurl from '../../api/baseurl';
 	export default {
 		data() {
@@ -68,12 +71,16 @@
 				HospitalPersonlist: null,
 				HospitalPersontotal: 0,
 				hospitalDepartmentList: null,
+				cardNo:'',
+				checkSign:'',
+				infotitle:'',
 			};
 		},
 		onLoad() {
 			this.region = Number(uni.getStorageSync('region'))
 			this.baseurl = baseurl
 			this.selectDepartmentinfo();
+			this.cardNo=uni.getStorageSync('userinfo').cardNo
 		},
 		methods: {
 			info() {
@@ -118,10 +125,29 @@
 			//图文问诊
 			goimagetextConsultation() {
 				if (this.region != 3) {
-					uni.navigateTo({
+					checkSignApply(this.cardNo).then(res => {
-						url: '/pagesB/imagetextConsultation/imagetextConsultation'
+						if (res.data) {
+							this.checkSign = res.data.code
+							this.infotitle = res.data.info
+							if (this.checkSign == "0") {
+								uni.navigateTo({
+									url:`/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`,
+
+								})
+							} else if (this.checkSign == "01") {
+								this.$refs.uToast.show({
+									title: this.infotitle,
+									type: 'error',
+								})
+							} else {
+							uni.navigateTo({
+								url: '/pagesB/imagetextConsultation/imagetextConsultation'
+							})
+							}
+						}
 					})
 
+
 				} else {
 					this.info()
 				}
@@ -287,4 +313,4 @@
 			margin: 20rpx auto 0;
 		}
 	}
-</style>
+</style>

pagesB/createnewconsultation/createnewconsultation.vue

@@ -12,9 +12,12 @@
 				现住址所在区
 			</view>
 			<view class="input" @tap='showPicker'>
-				<view class="inputtext"
+		<!-- 		<view class="inputtext"
 					:style="address=='请选择所属地区'?'font-size:22rpx;font-weight: 400;color: #8E8E8E !important;':''">
 					{{address}}
+				</view> -->
+				<view class="inputtext" v-if="address">
+					{{address}}
 				</view>
 				<image src="../../static/huijiantou.png" mode=""></image>
 			</view>
@@ -154,7 +157,7 @@
 				list: [],
 				addresslength: null,
 				imglistlength: null,
-				address: '请选择所属地区', //页面所属区域
+				address: '', //页面所属区域
 				formdata: {
 					address: '', //页面所属区域
 					patientId: '',
@@ -178,7 +181,7 @@
 		onLoad(options) {
 			this.uoloadaction = baseurl + '/nurseApplet/consultationInfo/uploadConsultationFile'
 			this.formdata = uni.getStorageSync('userinfo')
-			this.formdata.address = ''
+			// this.formdata.address = ''
 			this.formdata.fileUrls = []
 			this.infolist()
 			this.areaInfo();
@@ -317,6 +320,13 @@
 			},
 			infolist() {
 				detail(this.formdata.cardNo).then(res => {
+					if(res.data.provinceName && res.data.cityName && res.data.countyName &&res.data.townName){
+						this.address=res.data.provinceName+res.data.cityName+res.data.countyName+res.data.townName
+						this.formdata.address=this.address
+					}else if(res.data.provinceName && res.data.cityName && res.data.countyName){
+						this.address=res.data.provinceName+res.data.cityName+res.data.countyName
+						this.formdata.address=this.address
+					}
 					var status = '1'
 					if (res.code == 200) {
 						getHospitalPersonInfo(res.data.dutyDoctorNo, status).then(res => {
@@ -357,4 +367,4 @@
 
 <style lang="scss">
 	@import './createnewconsultation.scss';
-</style>
+</style>

pagesC/Onlinesigning/Onlinesigning.scss

@@ -6,9 +6,14 @@
 		background: #FFFFFF;
 		box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
 		border-radius: 5rpx;
+		::v-deep .u-toast{
+			margin-top: 6%;
+
+		}
 		::v-deep .u-checkbox {
 			width: 100% !important;
 			height: 80rpx !important;
+
 		}
 		.signing {
 			width: 637rpx;

pagesC/Onlinesigning/Onlinesigning.vue

@@ -636,6 +636,14 @@
 			},
 		},
 		onLoad(options) {
+			if(options.checkSign=="0"){
+				this.$refs.uToast.show({
+					title: '未签约，请先签约',
+					type: 'error',
+					duration:'2000',
+					position:'top',
+				})
+			}
 			var region = uni.getStorageSync('region')
 			// 德州
 			if (region == 1) {
@@ -691,4 +699,4 @@
 </script>
 <style lang="scss">
 	@import "./Onlinesigning.scss";
-</style>
+</style>