Merge remote-tracking branch 'origin/dev' into dev

pages/medicalservice/medicalservice.vue

@@ -254,17 +254,25 @@
 			goconsultationplatform() {
 				const value = uni.getStorageSync('openid');
 				const value2 = uni.getStorageSync('patientId');
-				if (value && value2) {
+				const value3 = uni.getStorageSync('region');
+				if (value && value2 &&value3!=3) {
 					uni.navigateTo({
 						url: '/pagesB/consultationplatform/consultationplatform',
 					})
-				} else {
+				} else if(!value && !value2) {
 					this.$refs.uToast.show({
 						title: '您未登录,请先登录',
 						type: 'error',
 						duration: '1000',
 						url: '/pages/login/login'
 					})
+				}else if(value3==3){
+					this.$refs.uToast.show({
+						title: '请重新选择区域',
+						type: 'error',
+						duration: '1000',
+						
+					})
 				}
 
 			},

pagesB/createnewconsultation/createnewconsultation.vue

@@ -155,12 +155,11 @@
 				imglistlength: null,
 				address: '请选择所属地区', //页面所属区域
 				formdata: {
-					address: '请选择所属地区', //页面所属区域
+					address:'', //页面所属区域
 					patientId: '',
 					patientName: '',
 					cardNo: '',
 					phone: '',
-					address: '',
 					doctorId: '',
 					doctorName: '',
 					consultationType: 'IMAGE_TEXT_CONSULTATION',
@@ -183,6 +182,7 @@
 			this.areaInfo();
 			let that = this
 			that.formdata = uni.getStorageSync('userinfo')
+			this.formdata.address=''
 			this.infolist()
 			uni.$on('doctordata', function(data) {
 				let item = JSON.parse(data.data)
@@ -215,6 +215,9 @@
 				this.info();
 			},
 			info() {
+				this.$delete(this.formdata,'id')
+				console.log(this.formdata.address,'774')
+				
 				this.formdata.consultationType = 'IMAGE_TEXT_CONSULTATION'
 				if (!this.formdata.address) {
 					this.$refs.uToast.show({

pagesC/Onlinesigning/Onlinesigning.vue

@@ -388,7 +388,7 @@
 					})
 				} else {
 					uni.navigateTo({
-						url: `/pagesC/choosedoctor/choosedoctor?orgNo=${this.query.orgNo}&userNo=${this.query.userNo}`
+						url: `/pagesC/choosedoctor/choosedoctor?orgNo=${this.query.orgNo}&userNo=${this.query.userNo}&static=${1}`
 					})
 				}
 			},

pagesC/choosedoctor/choosedoctor.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="app">
-		<!-- <view class="inputs">
+		<view class="inputs" v-if="show==true">
 			<i class="icon"></i>
 			<input type="text" name="" id="" class="input" placeholder="请输入医生姓名" v-model="realname">
-		</view> -->
+		</view>
 		<view class="list" v-if="doctorlist">
 			<view class="item" v-for="item in doctorlist" @tap='emitdata(item)'>
 				<image src="../../static/docHead.png" mode=""></image>
@@ -57,6 +57,7 @@
 	export default {
 		data() {
 			return {
+				show:"",
 				orgNo: null,
 				userNo: null,
 				teamNo: null,
@@ -108,10 +109,15 @@
 						delta: 1
 					});
 				}
-			
+
 			},
 		},
 		onLoad(options) {
+			console.log(options,'888')
+			if(options.static=="1"){
+				this.show=true
+
+			}
 			if (options.item) {
 				this.list = JSON.parse(options.item)
 				console.log(this.list, '58')
@@ -157,4 +163,4 @@
 
 <style lang="scss">
 	@import './choosedoctor.scss';
-</style>
+</style>

pagesC/seekadvicefrom/seekadvicefrom.vue

@@ -193,7 +193,7 @@
 			Read() {
 				let markReadData = {
 					consultationId: this.currentItem.id,
-					recipientId: this.currentItem.doctorId,
+					recipientId: this.currentItem.patientId,
 				}
 				markRead(markReadData)
 			},