diff --git a/pages/medicalservice/medicalservice.vue b/pages/medicalservice/medicalservice.vue
index 3880770..f049f55 100644
--- a/pages/medicalservice/medicalservice.vue
+++ b/pages/medicalservice/medicalservice.vue
@@ -85,20 +85,9 @@
setTimeout(e => {
// 筛查预约
if (!this.userInfo) {
- uni.showModal({
- title: "提示",
- content: "您还未注册，是否去注册？",
- confirmText: '是',
- cancelText: '否',
- success(res) {
- if (res.confirm) {
- uni.redirectTo({
- url: "/pagesB/register/register"
- })
- } else {
- wx.exitMiniProgram()
- }
- },
+ this.$refs.uToast.show({
+ title: res.msg,
+ type: '您未登录,请前往我的页面进行登录',
})
} else {
getScreening(this.cardNo).then(res => {
diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue
index da5b764..779c799 100644
--- a/pages/myinformation/myinformation.vue
+++ b/pages/myinformation/myinformation.vue
@@ -447,9 +447,6 @@
})
return
}
- if (resp.data.openid) {
- uni.setStorageSync("openid", resp.data.openid)
- }
if (resp.data.code == '0') {
that.$refs.uToast.show({
title: '未注册,请先注册',
@@ -461,7 +458,7 @@
}
that.timer = setTimeout(() => {
uni.navigateTo({
- url: '/pagesB/register/register',
+ url: `/pagesB/register/register?openid=${resp.data.openid}`,
})
}, 1500)
} else if (resp.data.code == '2') {
@@ -471,6 +468,9 @@
duration: '1500',
})
} else if (resp.data.code == '1') {
+ if (resp.data.openid) {
+ uni.setStorageSync("openid", resp.data.openid)
+ }
that.outlogin(that, resp.data.openid)
} else {
that.$refs.uToast.show({
@@ -496,12 +496,26 @@
uni.setStorageSync('phone', res.data
.phone);
that.scoket();
+ that.$refs.uToast.show({
+ title: '登录成功',
+ type: 'success',
+ back: 1
+ })
+ } else {
+ that.$refs.uToast.show({
+ title: '未查询到信息，请先去注册',
+ type: 'error',
+ duration: '1500',
+ })
+ if (that.timer) {
+ clearTimeout(that.timer)
+ }
+ that.timer = setTimeout(() => {
+ uni.navigateTo({
+ url: `/pagesB/register/register?openid=${uni.getStorageSync('openid')}`,
+ })
+ }, 1500)
}
- that.$refs.uToast.show({
- title: '登录成功',
- type: 'success',
- back: 1
- })
} else {
that.$refs.uToast.show({
title: '登录失败',
@@ -650,7 +664,8 @@
gomanagefamily() {
const value = uni.getStorageSync('userinfo');
const value2 = uni.getStorageSync('patientId');
- if (value && value2) {
+ const value3 = uni.getStorageSync('openid');
+ if (value && value2 && value3) {
uni.navigateTo({
url: '/pagesB/managefamily/managefamily'
})
@@ -660,10 +675,12 @@
},
// 添加家庭成员
addFamilyItem() {
- uni.navigateTo({
- url: '/pagesB/AddMembers/AddMembers'
- })
- this.showhome = false
+ if (uni.getStorageSync('openid')) {
+ uni.navigateTo({
+ url: '/pagesB/AddMembers/AddMembers'
+ })
+ this.showhome = false
+ }
// if (!this.userInfo) {
// uni.showModal({
// title: "提示",
diff --git a/pagesB/AddMembers/AddMembers.vue b/pagesB/AddMembers/AddMembers.vue
index 6c36f9a..70094ab 100644
--- a/pagesB/AddMembers/AddMembers.vue
+++ b/pagesB/AddMembers/AddMembers.vue
@@ -20,8 +20,8 @@
-
+
diff --git a/pagesB/facecollection/facecollection.vue b/pagesB/facecollection/facecollection.vue
index a3b05c4..9638d8e 100644
--- a/pagesB/facecollection/facecollection.vue
+++ b/pagesB/facecollection/facecollection.vue
@@ -210,12 +210,7 @@
uni.navigateBack({
delta: 1
})
-
- // uni.navigateTo({
- // url:`/pagesB/register/register?headPictureUrl=${this.tempImg}`
- // })
},
-
// 点击 - 取消上传
handleCancelClick() {
console.log(this.tempImg)
diff --git a/pagesB/login/login.vue b/pagesB/login/login.vue
index 05eab1a..b3e5bf8 100644
--- a/pagesB/login/login.vue
+++ b/pagesB/login/login.vue
@@ -160,9 +160,6 @@
})
return
}
- if (resp.data.openid) {
- uni.setStorageSync("openid", resp.data.openid)
- }
if (resp.data.code == '0') {
that.$refs.uToast.show({
title: '未注册,请先注册',
@@ -174,7 +171,7 @@
}
that.timer = setTimeout(() => {
uni.redirectTo({
- url: '/pagesB/register/register',
+ url: `/pagesB/register/register?openid=${resp.data.openid}`,
})
}, 1500)
} else if (resp.data.code == '2') {
@@ -184,6 +181,9 @@
duration: '1500',
})
} else if (resp.data.code == '1') {
+ if (resp.data.openid) {
+ uni.setStorageSync("openid", resp.data.openid)
+ }
logingetCurrentUser(resp.data.openid).then(res => {
if (res.code == 200) {
if (res.data) {
@@ -192,12 +192,26 @@
uni.setStorageSync('userinfo', res.data);
uni.setStorageSync('phone', res.data.phone);
that.scoket();
+ that.$refs.uToast.show({
+ title: '登录成功',
+ type: 'success',
+ back: 1
+ })
+ } else {
+ that.$refs.uToast.show({
+ title: '未查询到信息，请先去注册',
+ type: 'error',
+ duration: '1500',
+ })
+ if (that.timer) {
+ clearTimeout(that.timer)
+ }
+ that.timer = setTimeout(() => {
+ uni.navigateTo({
+ url: `/pagesB/register/register?openid=${uni.getStorageSync('openid')}`,
+ })
+ }, 1500)
}
- that.$refs.uToast.show({
- title: '登录成功',
- type: 'success',
- back: 1
- })
} else {
that.$refs.uToast.show({
title: '登录失败',
@@ -250,7 +264,7 @@
}
that.timer = setTimeout(() => {
uni.redirectTo({
- url: '/pagesB/register/register',
+ url: `/pagesB/register/register?openid=${uni.getStorageSync('openid')}`,
})
}, 1500)
} else if (resp.data.code == '2') {
diff --git a/pagesB/managefamily/managefamily.vue b/pagesB/managefamily/managefamily.vue
index b351c3d..87e2c4e 100644
--- a/pagesB/managefamily/managefamily.vue
+++ b/pagesB/managefamily/managefamily.vue
@@ -117,9 +117,11 @@
},
// 添加家庭成员
add() {
- uni.navigateTo({
- url: '/pagesB/AddMembers/AddMembers'
- })
+ if (uni.getStorageSync('openid')) {
+ uni.navigateTo({
+ url: '/pagesB/AddMembers/AddMembers'
+ })
+ }
},
gofamilymemberdetail(item) {
uni.navigateTo({
diff --git a/pagesB/register/register.vue b/pagesB/register/register.vue
index 6a82393..4878283 100644
--- a/pagesB/register/register.vue
+++ b/pagesB/register/register.vue
@@ -170,6 +170,7 @@
},
data() {
return {
+ openid:'',
SOCKETURL: '',
showNation: false, //户主关系
actions: [{
@@ -444,7 +445,7 @@
},
submit() {
var that = this
- that.query.openid = uni.getStorageSync('openid');
+ that.query.openid = this.openid
if (!uni.getStorageSync('region')) {
uni.setStorageSync("region", 2)
uni.setStorageSync("location", '东营市')
@@ -489,6 +490,7 @@
logingetCurrentUser(that.query.openid).then(res => {
uni.setStorageSync('patientId', res.data.id);
uni.setStorageSync('phone', res.data.phone);
+ uni.setStorageSync('openid', res.data.openid);
uni.setStorageSync('patientName', res.data
.patientName);
uni.setStorageSync("userinfo", res.data)
@@ -633,6 +635,7 @@
// that.query.patientId = value
// }
this.areaInfo()
+ this.openid = options.openid
},
//带参返回
// 从地图选点插件返回后，在页面的onShow生命周期函数中能够调用插件接口，取得选点结果对象