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

components/protocol/protocol.vue

@@ -175,14 +175,17 @@
 				}
 			},
 			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: tempFilePath,
+							filePath: that.meimage,
 							success: (resp) => {
 								uni.uploadFile({
 									url: baseurl +
@@ -210,6 +213,7 @@
 			// //签名
 			userSignaturePicture(data) {
 				let that = this
+				console.log(data,'9999')
 				that.meimage = data
 				uni.uploadFile({
 					url: baseurl + '/applet/sign/apply/residentSignatureUpload',

pages/myinformation/myinformation.vue

@@ -383,9 +383,17 @@
 			},
 			// 签约信息
 			Signing() {
-				uni.navigateTo({
+				if (uni.getStorageSync('region') == 3) {
-					url: '/pagesB/mysigning/mysigning'
+					this.$refs.uToast.show({
-				})
+						title: '当前地区不支持，请选择其它地区',
+						type: 'error',
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pagesB/mysigning/mysigning'
+					})
+				}
+
 			},
 			//去登陆
 			gologin() {
@@ -527,4 +535,4 @@
 
 <style lang="scss">
 	@import './myinformation.scss'
-</style>
+</style>

pagesB/screeningRecord/screeningRecord.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="screeningRecord">
+  <view class="screeningRecord" v-if="screeningResultData.length>0">
     <view class="screeningRecordItem" v-for="(item,index) in screeningResultData" :key="index">
       <!-- <view>筛查日期：{{ item.screeningDate }}</view> -->
       <view style="font-size: 16px;font-weight: 900;">{{ item.screeningDate }}</view>
@@ -12,8 +12,11 @@
         <span>查看筛查结果</span>
       </view>
     </view>
-
   </view>
+  <view v-else style="margin-top: 50%;">
+  	<u-empty mode="order" icon-size='220' text="暂无筛查记录"></u-empty>
+  </view>
+  
 </template>
 
 <script>

pagesC/Onlinesigning/Onlinesigning.vue

@@ -259,16 +259,17 @@
 						title: '请选择现住区县',
 						type: 'error',
 					})
-				} else if (!this.query.townName) {
+				// }
-					this.$refs.uToast.show({
+				// else if (!this.query.townName) {
-						title: '请选择乡镇/街道',
+				// 	this.$refs.uToast.show({
-						type: 'error',
+				// 		title: '请选择乡镇/街道',
-					})
+				// 		type: 'error',
-				} else if (!this.query.committeeName) {
+				// 	})
-					this.$refs.uToast.show({
+				// } else if (!this.query.committeeName) {
-						title: '请选择村/社区',
+				// 	this.$refs.uToast.show({
-						type: 'error',
+				// 		title: '请选择村/社区',
-					})
+				// 		type: 'error',
+				// 	})
 				} else if (!this.query.address) {
 					this.$refs.uToast.show({
 						title: '请输入详细地址',
@@ -386,7 +387,7 @@
 								type: 'success',
 								duration: 1500,
 								back: 1,
-								
+
 							})
 							// uni.switchTab({
 							// 	url: "/pages/homepage/homepage"

pagesC/Screeningdetails/Screeningdetails.vue

@@ -57,7 +57,7 @@
 				</view> -->
 			<view class="item">
 				诊断结果：
-				<span>{{screeningResultData.diagnosticResult}}</span>
+				<span v-if="screeningResultData.diagnosticResult">{{screeningResultData.diagnosticResult}}</span>
 			</view>
 		</view>
 	</view>

pagesC/appointmenttime/appointmenttime.vue

@@ -89,7 +89,7 @@
 								this.$refs.uToast.show({
 									title: '预约成功',
 									type: 'success',
-									url: '/pagesC/ServiceAppointment/ServiceAppointment'
+									// url: '/pagesC/ServiceAppointment/ServiceAppointment'
 								})
 							} else if (res.code == '500') {
 								this.$refs.uToast.show({

pagesC/choosedoctor/choosedoctor.vue

@@ -69,6 +69,7 @@
 			realname: {
 				handler(newval, oldval) {
 					console.log(newval, oldval)
+					this.pageNum=1;
 					this.getDoctorListinfo();
 				}
 			}