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

components/protocol/protocol.vue

@@ -175,14 +175,12 @@
 				}
 			},
 			openCamera() {
-				
 				let that = this
 				that.meimage=''
 				uni.chooseImage({
 					sizeType: ['compressed'],
 					sourceType: ['camera'],
 					success: function(res) {
-						console.log(res,'000')
 						that.meimage = res.tempFilePaths[0]
 						uni.saveImageToPhotosAlbum({
 							filePath: that.meimage,
@@ -199,8 +197,7 @@
 									success(respp) {
 										that.signatureshow = false
 										that.$emit('residentAutographPathlist', {
-											residentAutographPath: JSON.parse(res
-												.data).imgUrl,
+											residentAutographPath: JSON.parse(respp.data).imgUrl,
 											image: that.meimage
 										})
 									}
@@ -213,7 +210,6 @@
 			// //签名
 			userSignaturePicture(data) {
 				let that = this
-				console.log(data,'9999')
 				that.meimage = data
 				uni.uploadFile({
 					url: baseurl + '/applet/sign/apply/residentSignatureUpload',
@@ -306,4 +302,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/medicalservice/medicalservice.vue

@@ -20,7 +20,7 @@
 			<image src="../../static/pages/xinrenfuli.png" mode="" @tap="gomaterialbenefits"></image>
 		</view>
 		<view class="title">
-			<text>健康咨询</text>
+			<text>健康资讯</text>
 			<view class="" @tap='gohealth'>
 				<text>
 					查看更多
@@ -271,7 +271,7 @@
 						title: '请重新选择区域',
 						type: 'error',
 						duration: '1000',
-						
+
 					})
 				}
 
@@ -300,4 +300,4 @@
 
 <style lang="scss">
 	@import "./medicalservice.scss";
-</style>
+</style>

pages/myinformation/myinformation.vue

@@ -220,6 +220,9 @@
 	import {
 		createMobileToken
 	} from '@/api/pages/login/index.js'
+	import {
+		checkSignApply
+	} from '@/api/pages/homepage/homepage.js'
 	import baseurl from '@/api/baseurl.js'
 	export default {
 		data() {
@@ -230,14 +233,25 @@
 				list: {},
 				showhome: false, //切换
 				familyList: null, //切换列表
+				region:'',//城市
+				infotitle: null,
 			};
 		},
 		onShow() {
 			// this.bjimg = baseurl + '/profile/appletPicture/inviteFriendsOne.png'
 			this.appPersonallist = uni.getStorageSync('userinfo')
+			this.region = uni.getStorageSync('region')
 			this.baseurl = baseurl
 			this.myInfo()
 			this.getpersnoal()
+			if (this.appPersonallist && this.region != 3) {
+				checkSignApply(this.appPersonallist.cardNo).then(res => {
+					if (res.data) {
+						this.checkSign = res.data.code
+						this.infotitle = res.data.info
+					}
+				})
+			} else {}
 		},
 		methods: {
 			gomyappiont() {
@@ -382,18 +396,58 @@
 
 			},
 			// 签约信息
-			Signing() {
-				if (uni.getStorageSync('region') == 3) {
-					this.$refs.uToast.show({
-						title: '当前地区不支持，请选择其它地区',
-						type: 'error',
-					})
-				} else {
-					uni.navigateTo({
-						url: '/pagesB/mysigning/mysigning'
-					})
-				}
+			// Signing() {
+			// 	if (uni.getStorageSync('region') == 3) {
+			// 		this.$refs.uToast.show({
+			// 			title: '当前地区不支持，请选择其它地区',
+			// 			type: 'error',
+			// 		})
+			// 	} else {
+			// 		uni.navigateTo({
+			// 			url: '/pagesB/mysigning/mysigning'
+			// 		})
+			// 	}
 
+			// },
+			// 家医功能提示
+			family() {
+				this.$refs.uToast.show({
+					title: '当前绑定地市不支持',
+					type: 'error',
+					duration: '3000',
+				})
+			},
+			
+			// 签约信息
+			Signing() {
+				if (!this.appPersonallist) {
+					this.gologin();
+				} else if (this.appPersonallist) {
+					if (this.region == 3) {
+						this.family()
+					} else {
+						if (this.region == 1 || this.region == 2) {
+							if (this.checkSign == "0") {
+								this.$refs.uToast.show({
+									title: '未签约，请先签约',
+									type: 'error',
+									url: "/pagesC/Onlinesigning/Onlinesigning"
+								})
+							} else if (this.checkSign == "01") {
+								this.$refs.uToast.show({
+									title: this.infotitle,
+									type: 'error',
+								})
+							} else {
+								uni.navigateTo({
+									url: "/pagesB/mysigning/mysigning"
+								})
+							}
+						} else {
+							this.family()
+						}
+					}
+				}
 			},
 			//去登陆
 			gologin() {

pagesB/medicine/medicine.vue

@@ -42,6 +42,7 @@
 								{{ item.academicTitle=='ATTENDING_DOCTOR'?'主治医师':''}}
 								{{ item.academicTitle=='PHYSICIAN'?'医师':''}}
 								{{ item.academicTitle=='HEALER'?'医士':''}}
+								{{ item.academicTitle=='RESIDENT_PHYSICIAN'?'住院医师':''}}
 							</view>
 							<view class="words">{{item.personIntroduce}}
 							</view>