修改获取位置

pages/login/login.vue

@@ -140,10 +140,10 @@
 					},
 					//失败
 					fail: (res) => {
-						// uni.showToast({
+						uni.showToast({
-						// 	icon: 'none',
+							icon: 'none',
-						// 	title: '获取地址失败,请打开定位',
+							title: '获取地址失败,请打开定位',
-						// })
+						})
 					}
 				})
 			},

pages/register/register.vue

@@ -70,14 +70,14 @@
 						maxlength='40' />
 
 				</view> -->
-			<!-- 	<view class="name">
+				<view class="name">
 					所在位置
 					<view class="selectdata" @tap='getlocation'>
 						<text v-if="query.locationName ==''">请选择所在位置</text>
 						<text class="testitem"
 							style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{query.locationName}}</text>
 					</view>
-				</view> -->
+				</view>
 				<view class="name">
 					基础疾病
 					<view class="select" @tap="godisease">
@@ -268,11 +268,9 @@
 					couponId: null,
 					patientName: "",
 					cardNo: "",
-					phone: "", 
+					phone: "",
 					address: "",
 					areaCode: "",
-					// homeLongitude: '118.5816',
-					// homeLatitude: '37.44875',
 					homeLongitude: '',
 					homeLatitude: '',
 					nurseTypeIdList: [],
@@ -420,15 +418,13 @@
 						type: 'error'
 					})
 					return
-				} 
+				} else if (!that.query.locationName) {
-				// else if (!that.query.locationName) {
+					that.$refs.uToast.show({
-				// 	that.$refs.uToast.show({
+						title: '请选择所在位置',
-				// 		title: '请选择所在位置',
+						type: 'error'
-				// 		type: 'error'
+					})
-				// 	})
+					return
-				// 	return
+				} else if (!that.query.birthDate) {
-				// }
-				 else if (!that.query.birthDate) {
 					that.$refs.uToast.show({
 						title: '请选择出生日期',
 						type: 'error'

pagesB/nursestation/nursestation.vue

@@ -189,10 +189,10 @@
 				classifycurrent: 0, //分类下标
 				nurseClassifyInfoId: '', //分类id
 				scrollTop: 0,
-				// latitude: 39.90374,
-				// longitude: 116.397827,
 				latitude: '',
 				longitude: '',
+				// latitude: '',
+				// longitude: '',
 			}
 		},
 		onShow() {

pagesB/site/site.vue

@@ -98,10 +98,8 @@
 				pageNum: 1,
 				pageSize: 10,
 				total: 0,
-				// latitude: 39.90374,
+				latitude: "",
-				// longitude: 116.397827,
+				longitude: "",
-				latitude:'',
-				longitude:'',
 				nurseClassId: '', //护理站分类id
 				itemClassId: '', //护理项目分类id
 				searchName: '', //通用名称
@@ -192,7 +190,6 @@
 								success: function(res) {
 									that.latitude = res.latitude
 									that.longitude = res.longitude
-								
 									that.mask = false
 								}
 							});
@@ -281,27 +278,23 @@
 			const value = uni.getStorageSync('patientId');
 			if (value) {
 				getPatientInfo(value).then(res => {
-					console.log(res)
 					if (res.code == 200) {
 						if (res.data.homeLatitude && res.data.homeLongitude) {
 							that.latitude = res.data.homeLatitude
 							that.longitude = res.data.homeLongitude
-							
 							that.requestinfo();
 						} else {
-							that.requestinfo();
+							uni.getLocation({
-							// uni.getLocation({
+								type: 'wgs84',
-							// 	type: 'wgs84',
+								success: function(resp) {
-							// 	success: function(resp) {
+									that.latitude = resp.latitude
-							// 		that.latitude = resp.latitude
+									that.longitude = resp.longitude
-							// 		that.longitude = resp.longitude
+									that.requestinfo();
-							// 			console.log(that.latitude,that.longitude)
+								},
-							// 		that.requestinfo();
+								fail(err) {
-							// 	},
+									that.mask = true;
-							// 	fail(err) {
+								}
-							// 		that.mask = true;
+							});
-							// 	}
-							// });
 						}
 					} else if (res.code == 9999) {} else {
 						that.requestinfo();