diff --git a/pages.json b/pages.json index db3ee77..73b6e30 100644 --- a/pages.json +++ b/pages.json @@ -96,7 +96,7 @@ "navigationBarTitleText": "医路优品", "navigationBarBackgroundColor": "#ffffff", "onReachBottomDistance": 40, //距离底部多远时触发 单位为px - "enablePullDownRefresh": true ,//设置参数为true + "enablePullDownRefresh": true, //设置参数为true "navigationStyle": "custom" } }, { @@ -342,7 +342,13 @@ "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" } - + }, { + "path": "pages/geriatricdisease/geriatricdisease", + "style": { + "navigationBarTitleText": "国家老年病中心", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } } ], "globalStyle": { diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue index 44a11cc..efa7109 100644 --- a/pages/CommodityDetails/CommodityDetails.vue +++ b/pages/CommodityDetails/CommodityDetails.vue @@ -12,7 +12,7 @@ ￥{{goodsPrice}} - + 已选 @@ -51,7 +51,7 @@ - + 立即购买 @@ -237,6 +237,27 @@ url: '/pages/information/information' }) }, + buyshowtrue() { + var that = this + const value = uni.getStorageSync('openid'); + const value2 = uni.getStorageSync('patientId'); + if (value && value2) { + that.buyshow = true + } else { + that.$refs.uToast.show({ + title: '未登录,请先登录', + type: 'error' + }) + if (that.timer) { + clearTimeout(that.timer) + } + that.timer = setTimeout(e => { + uni.navigateTo({ + url: '/pages/login/login' + }) + }, 1000) + } + }, //立即购买跳转确认订单页面 tapbuy() { var that = this @@ -529,27 +550,32 @@ this.baseurl = baseurl this.usershow = false this.goodsDetailsinfo(this.goodsInfoId) - goodPatientInfo(this.updata.patientId).then(res => { - var user = res.data.filter(e => e.id == this.userid) - if (user.length >= 1) { - // user[0].address = user[0].provinceName + user[0].cityName + user[0].regionName + user[0] - // .streetName + user[0].receiveAddress - this.updata.receiver = user[0].receiveName - this.updata.receiveAddress = user[0].areaName + user[0].receiveAddress - this.updata.phone = user[0].receivePhone - this.userid = user[0].id - } else { - // res.data.forEach(e => { - // e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e - // .receiveAddress - // }) - this.updata.receiver = res.data[0].receiveName - // this.updata.receiveAddress = res.data[0].address - this.updata.receiveAddress = res.data[0].areaName + res.data[0].receiveAddress - this.updata.phone = res.data[0].receivePhone - this.userid = res.data[0].id - } - }) + const value = uni.getStorageSync('patientId'); + if (value) { + goodPatientInfo(value).then(res => { + if (res.code == 200) { + var user = res.data.filter(e => e.id == this.userid) + if (user.length >= 1) { + // user[0].address = user[0].provinceName + user[0].cityName + user[0].regionName + user[0] + // .streetName + user[0].receiveAddress + this.updata.receiver = user[0].receiveName + this.updata.receiveAddress = user[0].areaName + user[0].receiveAddress + this.updata.phone = user[0].receivePhone + this.userid = user[0].id + } else { + // res.data.forEach(e => { + // e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e + // .receiveAddress + // }) + this.updata.receiver = res.data[0].receiveName + // this.updata.receiveAddress = res.data[0].address + this.updata.receiveAddress = res.data[0].areaName + res.data[0].receiveAddress + this.updata.phone = res.data[0].receivePhone + this.userid = res.data[0].id + } + } + }) + } else {} let useritem = null uni.$on('updata', function(data) { that.updata = JSON.parse(data.updata) diff --git a/pages/Healthitem/Healthitem.vue b/pages/Healthitem/Healthitem.vue index f8264e2..a37614a 100644 --- a/pages/Healthitem/Healthitem.vue +++ b/pages/Healthitem/Healthitem.vue @@ -26,6 +26,24 @@ // console.log(this.item.informationContent) }, onReady() {}, //更改导航栏文字 + //1.分享给朋友 + onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath + return { + title: '泉医到家', + path: url, + } + }, + //2.分享到朋友圈 + onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath + return { + title: '泉医到家', + path: url, + } + }, } diff --git a/pages/Healthknowledge/Healthknowledge.vue b/pages/Healthknowledge/Healthknowledge.vue index a8ada8c..a7708bf 100644 --- a/pages/Healthknowledge/Healthknowledge.vue +++ b/pages/Healthknowledge/Healthknowledge.vue @@ -91,6 +91,24 @@ uni.stopPullDownRefresh(); }, 1000); }, + //1.分享给朋友 + onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath + return { + title: '泉医到家', + path: url, + } + }, + //2.分享到朋友圈 + onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath + return { + title: '泉医到家', + path: url, + } + }, } diff --git a/pages/Personal/Personal.vue b/pages/Personal/Personal.vue index 1c10b87..09e5424 100644 --- a/pages/Personal/Personal.vue +++ b/pages/Personal/Personal.vue @@ -1,261 +1,143 @@ - + diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue index 9b15970..1d4b44c 100644 --- a/pages/ProductList/ProductList.vue +++ b/pages/ProductList/ProductList.vue @@ -74,18 +74,10 @@ }, onShow() { var that = this - try { - const value = uni.getStorageSync('openid'); - const value3 = uni.getStorageSync('Refresh'); - if (value) {} else { - uni.navigateTo({ - url: '/pages/login/login' - }) - } - if (value3) { - that.goodsListinfo(); - } - } catch (e) {} + const value3 = uni.getStorageSync('Refresh'); + if (value3) { + that.goodsListinfo(); + } }, onLoad(options) { //获取传值 if (options.title) { diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue index 8046e25..8a3d621 100644 --- a/pages/appointmenttime/appointmenttime.vue +++ b/pages/appointmenttime/appointmenttime.vue @@ -253,6 +253,7 @@ title: '请阅读用户协议并同意', type: 'error', }) + this.maskshow = true } else { this.orderlist.orderCount = 1; this.orderlist.orderConsumableList = [] diff --git a/pages/diseasemanagement/diseasemanagement.vue b/pages/diseasemanagement/diseasemanagement.vue index cfd9cf2..5087545 100644 --- a/pages/diseasemanagement/diseasemanagement.vue +++ b/pages/diseasemanagement/diseasemanagement.vue @@ -1,14 +1,17 @@