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

pages/register/register.vue

@@ -3,7 +3,6 @@
 		<view class="head" @tap="Face">
 			<image class="Facecollection" :src="query.headPictureUrl" v-if="query.headPictureUrl"></image>
 			<image class="Facecollection" src="../../static/pages/Facecollection.png" v-else></image>
-
 			<span>人脸采集</span>
 		</view>
 		<view class="form">
@@ -73,13 +72,11 @@
 				</view> -->
 				<view class="name">
 					所在位置
-					<view class="select" @tap='getAddress()'>
+					<view class="select" @tap='getAddress'>
 						<text v-if="query.locationName ==''">请选择所在位置</text>
 						<text class="testitem">{{query.locationName}}</text>
 					</view>
-
 				</view>
-
 				<view class="name">
 					基础疾病
 					<view class="select" @tap="godisease">
@@ -389,32 +386,27 @@
 								title: '请审核并同意用户协议',
 								type: 'error'
 							})
-						} 
-						else if (that.query.sex == "") {
+						} else if (that.query.sex == "") {
 							that.$refs.uToast.show({
 								title: '请选择性别',
 								type: 'error'
 							})
-						}
-						else if (!that.query.locationName) {
+						} else if (!that.query.locationName) {
 							that.$refs.uToast.show({
 								title: '请选择所在位置',
 								type: 'error'
 							})
-						}
-						else if (!that.query.birthDate) {
+						} else if (!that.query.birthDate) {
 							that.$refs.uToast.show({
 								title: '请选择出生日期',
 								type: 'error'
 							})
-						}
-						else if (that.query.diseaseList.length==0) {
+						} else if (that.query.diseaseList.length == 0) {
 							that.$refs.uToast.show({
 								title: '请选择基础疾病',
 								type: 'error'
 							})
-						}
-						else {
+						} else {
 							registerdata(that.query).then(res => {
 								if (res.code == 200) {
 									getCurrentUser(that.query.openid, that.query.cityCode).then(res => {
@@ -484,25 +476,12 @@
 						that.query.locationName = location.address
 						that.query.homeLongitude = location.longitude;
 						that.query.homeLatitude = location.latitude;
+					},
+					fail(err) {
+						console.log(err)
 					}
 				});
 			},
-			// getAddress() {
-			// 	uni.getLocation({
-			// 		type: 'wgs84',
-			// 		success: function(res) {
-			// 			const key = '3VABZ-6LZWK-YPAJ3-AMQED-D7RUK-VPB37'; //使用在腾讯位置服务申请的key
-			// 			const referer = '新医路健康服务平台'; //调用插件的app的名称
-			// 			const location = JSON.stringify({
-			// 				latitude: 39.89631551,
-			// 				longitude: 116.323459711
-			// 			});
-			// 			wx.navigateTo({
-			// 				url: 'plugin://chooseLocation/index?key=' + key + '&referer=' + referer
-			// 			});
-			// 		}
-			// 	});
-			// },
 			//区街道
 			areaInfo() {
 				getSubordinateRegions().then(res => {