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

pages/homepage/homepage.vue

@@ -115,14 +115,14 @@
 				uni.setStorageSync("region", 3)
 			}
 			this.region = uni.getStorageSync('region')
-			if (this.region) {
-				if (this.region == "1" || this.region == "2") {
+			// if (this.region) {
+			// 	if (this.region == "1" || this.region == "2") {
 
-				} else {
-					this.family()
-				}
+			// 	} else {
+			// 		this.family()
+			// 	}
 
-			}
+			// }
 
 			if (this.userinfo) {
 				this.patientName = this.userinfo.patientName

pagesC/ServiceAppointment/ServiceAppointment.vue

@@ -22,6 +22,7 @@
 				预约
 			</view>
 		</view>
+		<u-toast ref="uToast" />
 
 	</view>
 </template>
@@ -60,7 +61,16 @@
 				this.userinfo = uni.getStorageSync('userinfo');
 				this.identity = this.userinfo.cardNo
 				getForm(this.identity, this.projectName).then(res => {
-					this.listinfo = res.data
+					if(res.code==500){
+						this.$refs.uToast.show({
+							title: res.msg,
+							type: 'error',
+							duration: '1000',
+						})
+					}else{
+						this.listinfo = res.data
+
+					}
 				})
 			},
 			goprevious() {