diff --git a/pages.json b/pages.json index 3b36af7..e3e6e51 100644 --- a/pages.json +++ b/pages.json @@ -304,7 +304,16 @@ "enablePullDownRefresh": false } } - ], + ,{ + "path" : "pages/Moreoptions/Moreoptions", + "style" : + { + "navigationBarTitleText": "护理机构", + "enablePullDownRefresh": false + } + + } + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "", diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue index 08fd97e..7bcbfee 100644 --- a/pages/CommodityDetails/CommodityDetails.vue +++ b/pages/CommodityDetails/CommodityDetails.vue @@ -816,6 +816,7 @@ that.updata.receiveAddress = useritem.areaName + useritem.receiveAddress that.userid = useritem.id } + uni.$off('updata') }) }, //1.分享给朋友 diff --git a/pages/Moreoptions/Moreoptions.vue b/pages/Moreoptions/Moreoptions.vue new file mode 100644 index 0000000..98f6aa3 --- /dev/null +++ b/pages/Moreoptions/Moreoptions.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/pages/Personal/Personal.vue b/pages/Personal/Personal.vue index 481b0fa..da68bea 100644 --- a/pages/Personal/Personal.vue +++ b/pages/Personal/Personal.vue @@ -166,7 +166,7 @@ if (value) {} else { that.appPersonallist = null that.$refs.uToast.show({ - title: '请先登录', + title: '您未登录,请先登录', type: 'error', duration: '1000', }) @@ -204,7 +204,7 @@ }); } else { that.$refs.uToast.show({ - title: '您未登录', + title: '您未登录,请先登录', type: 'error', duration: '1000' }) diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue index 7f7344c..6d1edd8 100644 --- a/pages/appointmenttime/appointmenttime.vue +++ b/pages/appointmenttime/appointmenttime.vue @@ -200,6 +200,7 @@ that.personInfo.phone = that.useritem.receivePhone that.personInfo.address = that.useritem.address } else {} + uni.$off('updata') }) }, onLoad(options) { diff --git a/pages/confirmOrder/confirmOrder.vue b/pages/confirmOrder/confirmOrder.vue index b6e729a..c387395 100644 --- a/pages/confirmOrder/confirmOrder.vue +++ b/pages/confirmOrder/confirmOrder.vue @@ -202,6 +202,7 @@ that.updata.phone = useritem.receivePhone that.updata.receiveAddress = useritem.address } + uni.$off('updata') }) } } diff --git a/pages/information/information.vue b/pages/information/information.vue index df3320a..83feaa0 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -387,6 +387,7 @@ that.query.nurseTypeIdList = that.query.nurseTypeIdList.filter(el => el != e.id) }) } + uni.$off('disease') }) }, } diff --git a/pages/integral/integral.vue b/pages/integral/integral.vue index 09e703e..d1fd8b3 100644 --- a/pages/integral/integral.vue +++ b/pages/integral/integral.vue @@ -312,6 +312,7 @@ that.updata.receiveAddress = useritem.areaName + useritem.receiveAddress that.userid = useritem.id } + uni.$off('updata') }) }, methods: { diff --git a/pages/modify/modify.vue b/pages/modify/modify.vue index 2b9cfcb..48f3c0c 100644 --- a/pages/modify/modify.vue +++ b/pages/modify/modify.vue @@ -424,6 +424,7 @@ // } uni.$on('disease', function(data) { that.patientDiseaseInfoList = JSON.parse(data.disease) + uni.$off('disease') }) }, } diff --git a/pages/site/site.vue b/pages/site/site.vue index a3d7aac..5f73450 100644 --- a/pages/site/site.vue +++ b/pages/site/site.vue @@ -12,18 +12,12 @@ {{item.classifyName}} - + 更多 - - - - 收起 - - @@ -113,20 +107,23 @@ }) } }, - lengthlist(item) { - uni.showLoading({ - title: '', - duration: 500 - }); - setTimeout((e) => { - this.lengthlistshow = !this.lengthlistshow - if (item) { - this.nurseItemClassifyInfoList = this.nurseItemClassifyInfolistlength - } else { - this.nurseItemClassifyInfoList = this.nurseItemClassifyInfolistlength.slice(0, 7) - } - uni.hideLoading(); - }, 500) + lengthlist() { + uni.navigateTo({ + url: "/pages/Moreoptions/Moreoptions" + }) + // uni.showLoading({ + // title: '', + // duration: 500 + // }); + // setTimeout((e) => { + // this.lengthlistshow = !this.lengthlistshow + // if (item) { + // this.nurseItemClassifyInfoList = this.nurseItemClassifyInfolistlength + // } else { + // this.nurseItemClassifyInfoList = this.nurseItemClassifyInfolistlength.slice(0, 7) + // } + // uni.hideLoading(); + // }, 500) }, //点击护理项目分类 tapitemclass(item) { @@ -243,10 +240,23 @@ }, }, onShow() { + var that = this + uni.$on('moreoptionitem', function(data) { + if (data.item) { + that.tapitemclass(JSON.parse(data.item)) + } + uni.$off('moreoptionitem') + }) + }, + onHide() { this.nurseClassId = '' this.itemClassId = '' this.conNewcurrent = 0 + this.requestinfo(); + }, + onLoad() { var that = this + this.getNurseClassifyinfo(); const value = uni.getStorageSync('patientId'); if (value) { getPatientInfo(value).then(res => { @@ -289,9 +299,6 @@ // }); } }, - onLoad() { - this.getNurseClassifyinfo(); - }, //1.分享给朋友 onShareAppMessage(res) { let pages = getCurrentPages();