diff --git a/pages/login/login.vue b/pages/login/login.vue index 5577e24..7bab419 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -140,10 +140,10 @@ }, //失败 fail: (res) => { - // uni.showToast({ - // icon: 'none', - // title: '获取地址失败,请打开定位', - // }) + uni.showToast({ + icon: 'none', + title: '获取地址失败,请打开定位', + }) } }) }, diff --git a/pages/register/register.vue b/pages/register/register.vue index 43150e8..93811b8 100644 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -70,14 +70,14 @@ maxlength='40' /> --> - + 基础疾病 @@ -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) { - // that.$refs.uToast.show({ - // title: '请选择所在位置', - // type: 'error' - // }) - // return - // } - else if (!that.query.birthDate) { + } else if (!that.query.locationName) { + that.$refs.uToast.show({ + title: '请选择所在位置', + type: 'error' + }) + return + } else if (!that.query.birthDate) { that.$refs.uToast.show({ title: '请选择出生日期', type: 'error' diff --git a/pagesB/nursestation/nursestation.vue b/pagesB/nursestation/nursestation.vue index d021c1b..b892e3a 100644 --- a/pagesB/nursestation/nursestation.vue +++ b/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() { diff --git a/pagesB/site/site.vue b/pagesB/site/site.vue index 0292980..97589fb 100644 --- a/pagesB/site/site.vue +++ b/pagesB/site/site.vue @@ -98,10 +98,8 @@ pageNum: 1, pageSize: 10, total: 0, - // latitude: 39.90374, - // longitude: 116.397827, - latitude:'', - 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({ - // type: 'wgs84', - // success: function(resp) { - // that.latitude = resp.latitude - // that.longitude = resp.longitude - // console.log(that.latitude,that.longitude) - // that.requestinfo(); - // }, - // fail(err) { - // that.mask = true; - // } - // }); + uni.getLocation({ + type: 'wgs84', + success: function(resp) { + that.latitude = resp.latitude + that.longitude = resp.longitude + that.requestinfo(); + }, + fail(err) { + that.mask = true; + } + }); } } else if (res.code == 9999) {} else { that.requestinfo();