diff --git a/pages/ProjectDetails/ProjectDetails.vue b/pages/ProjectDetails/ProjectDetails.vue index 2f13ffb..4424c05 100644 --- a/pages/ProjectDetails/ProjectDetails.vue +++ b/pages/ProjectDetails/ProjectDetails.vue @@ -85,14 +85,14 @@ stationId: null, stationItemId: null, stationItemPriceId: null, - hospitalcare:false, + nurseStationId: null, } }, onLoad(options) { this.stationId = options.stationId this.stationItemId = options.stationItemId this.stationItemPriceId = options.stationItemPriceId - this.hospitalcare = options.hospitalcare + this.nurseStationId = options.nurseStationId }, onShow() { this.baseurl = baseurl @@ -163,16 +163,10 @@ if (res.data.loginFlag) { that.usershow = false const scenenurseStationId = uni.getStorageSync('scenenurseStationId'); - if (scenenurseStationId) { - if (that.hospitalcare) { - uni.navigateTo({ - url: `/pages/hospitalcare/hospitalcare?stationId=${this.stationId}&stationItemId=${this.stationItemId}&stationItemPriceId=${this.stationItemPriceId}`, - }) - } else { - uni.navigateTo({ - url: `/pages/appointmenttime/appointmenttime?stationId=${this.stationId}&stationItemId=${this.stationItemId}&stationItemPriceId=${this.stationItemPriceId}`, - }) - } + if (that.nurseStationId == scenenurseStationId) { + uni.navigateTo({ + url: `/pages/hospitalcare/hospitalcare?stationId=${this.stationId}&stationItemId=${this.stationItemId}&stationItemPriceId=${this.stationItemPriceId}`, + }) } else { uni.navigateTo({ url: `/pages/appointmenttime/appointmenttime?stationId=${this.stationId}&stationItemId=${this.stationItemId}&stationItemPriceId=${this.stationItemPriceId}`, diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index af826c1..bebb189 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -334,8 +334,8 @@ //跳转 gopzyh() { uni.navigateTo({ - // url: `/pages/nursestation/nursestation?nurseStationId=${13}&hospitalcare=${true}` - url: `/pages/nursestation/nursestation?nurseStationId=${3}&hospitalcare=${true}` + // url: `/pages/nursestation/nursestation?nurseStationId=${13}` + url: `/pages/nursestation/nursestation?nurseStationId=${3}` }) }, //跳转贴心智养 diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue index b242330..665f706 100644 --- a/pages/nursestation/nursestation.vue +++ b/pages/nursestation/nursestation.vue @@ -205,7 +205,6 @@ distance: null, //距离 nurseClassifyInfoId: '', //分类id scrollTop: 0, - hospitalcare: false, } }, onShow() { @@ -218,16 +217,13 @@ onLoad(options) { let that = this this.nurseStationId = options.nurseStationId - this.hospitalcare = options.hospitalcare // scene 需要使用 decodeURIComponent 才能获取到生成二维码时传入的 scene if (options.scene) { + createMobileToken().then(res => { + uni.setStorageSync("token", res.data.token) + }) this.nurseStationId = decodeURIComponent(options.scene) - if (this.nurseStationId) { - createMobileToken().then(res => { - uni.setStorageSync("token", res.data.token) - }) - uni.setStorageSync("scenenurseStationId", this.nurseStationId) - } + uni.setStorageSync("scenenurseStationId", this.nurseStationId) } }, methods: { @@ -315,16 +311,10 @@ if (res.data.loginFlag) { that.usershow = false const scenenurseStationId = uni.getStorageSync('scenenurseStationId'); - if (scenenurseStationId) { - if (that.hospitalcare) { - uni.navigateTo({ - url: `/pages/hospitalcare/hospitalcare?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`, - }) - } else { - uni.navigateTo({ - url: `/pages/appointmenttime/appointmenttime?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`, - }) - } + if (that.list.nurseStationId == scenenurseStationId) { + uni.navigateTo({ + url: `/pages/hospitalcare/hospitalcare?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`, + }) } else { uni.navigateTo({ url: `/pages/appointmenttime/appointmenttime?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`, @@ -433,7 +423,7 @@ }, goProjectDetails(item) { uni.navigateTo({ - url: `/pages/ProjectDetails/ProjectDetails?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}&hospitalcare=${this.hospitalcare}`, + url: `/pages/ProjectDetails/ProjectDetails?nurseStationId=${this.nurseStationId}&stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`, }) }, gophone() {