diff --git a/pages.json b/pages.json index 1d2a730..811b319 100644 --- a/pages.json +++ b/pages.json @@ -9,6 +9,14 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } + },{ + "path": "pages/modifyAddress/modifyAddress", + "style": { + "navigationBarTitleText": "修改地址", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" //背景颜色 + } + }, { "path": "pages/lookrate/lookrate", @@ -301,15 +309,7 @@ "navigationBarBackgroundColor": "#ffffff" } }, - { - "path": "pages/modifyAddress/modifyAddress", - "style": { - "navigationBarTitleText": "修改地址", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 - } - }, { "path": "pages/Doctordetails/Doctordetails", "style": { @@ -333,7 +333,7 @@ "navigationBarBackgroundColor": "#ffffff" } } - ], + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "", diff --git a/pages/AppointmentRecord/AppointmentRecord.vue b/pages/AppointmentRecord/AppointmentRecord.vue index 556577f..27ee482 100644 --- a/pages/AppointmentRecord/AppointmentRecord.vue +++ b/pages/AppointmentRecord/AppointmentRecord.vue @@ -64,16 +64,20 @@ }, methods: { onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { - title: this.share.title, - path: this.share.path, + title: '泉医到家', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { - title: this.share.title, - path: this.share.path, + title: '泉医到家', + path: url, } }, } diff --git a/pages/Bodysatelliteintegration/Bodysatelliteintegration.vue b/pages/Bodysatelliteintegration/Bodysatelliteintegration.vue index 1affb3b..b388325 100644 --- a/pages/Bodysatelliteintegration/Bodysatelliteintegration.vue +++ b/pages/Bodysatelliteintegration/Bodysatelliteintegration.vue @@ -24,16 +24,20 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, } diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue index dc9ca5f..f27ad43 100644 --- a/pages/CommodityDetails/CommodityDetails.vue +++ b/pages/CommodityDetails/CommodityDetails.vue @@ -66,7 +66,7 @@ {{goodsDetailslist.goodsName}} - + 暂无 @@ -388,16 +388,20 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, } diff --git a/pages/Doctordetails/Doctordetails.vue b/pages/Doctordetails/Doctordetails.vue index 3673e5d..1a98460 100644 --- a/pages/Doctordetails/Doctordetails.vue +++ b/pages/Doctordetails/Doctordetails.vue @@ -29,16 +29,20 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, } diff --git a/pages/Geriatricdisease/Geriatricdisease.vue b/pages/Geriatricdisease/Geriatricdisease.vue index 42501f2..2fd7ef5 100644 --- a/pages/Geriatricdisease/Geriatricdisease.vue +++ b/pages/Geriatricdisease/Geriatricdisease.vue @@ -30,16 +30,20 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, } diff --git a/pages/Personal/Personal.vue b/pages/Personal/Personal.vue index 71e6745..6d46bb1 100644 --- a/pages/Personal/Personal.vue +++ b/pages/Personal/Personal.vue @@ -130,16 +130,20 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, } diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue index 84a8a41..db94bd9 100644 --- a/pages/ProductList/ProductList.vue +++ b/pages/ProductList/ProductList.vue @@ -71,7 +71,9 @@ } catch (e) {} }, onLoad(options) { //获取传值 - this.title = options.title //导航栏标题 + if (options.title) { + this.title = options.title //导航栏标题 + } this.goodsCategoryId = options.goodsCategoryId //请求id this.baseurl = baseurl; this.goodsListinfo() @@ -126,16 +128,22 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath + url = decodeURIComponent(url) return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath + url = decodeURIComponent(url) return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, } diff --git a/pages/ProjectDetails/ProjectDetails.vue b/pages/ProjectDetails/ProjectDetails.vue index 2dc0225..f133ad3 100644 --- a/pages/ProjectDetails/ProjectDetails.vue +++ b/pages/ProjectDetails/ProjectDetails.vue @@ -150,16 +150,20 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, } diff --git a/pages/detail/detail.vue b/pages/detail/detail.vue index bf0a438..27d6a5b 100644 --- a/pages/detail/detail.vue +++ b/pages/detail/detail.vue @@ -31,16 +31,20 @@ methods: {}, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, } diff --git a/pages/diagnosis/diagnosis.vue b/pages/diagnosis/diagnosis.vue index 8f034a8..4794935 100644 --- a/pages/diagnosis/diagnosis.vue +++ b/pages/diagnosis/diagnosis.vue @@ -50,16 +50,20 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, } diff --git a/pages/diseasemanagement/diseasemanagement.vue b/pages/diseasemanagement/diseasemanagement.vue index d5ac5d2..f11b3de 100644 --- a/pages/diseasemanagement/diseasemanagement.vue +++ b/pages/diseasemanagement/diseasemanagement.vue @@ -24,16 +24,20 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, } diff --git a/pages/doctorslist/doctorslist.vue b/pages/doctorslist/doctorslist.vue index 91d9194..b6a83cf 100644 --- a/pages/doctorslist/doctorslist.vue +++ b/pages/doctorslist/doctorslist.vue @@ -46,16 +46,20 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, } diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index c50a69d..5770158 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -49,16 +49,20 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, methods: { diff --git a/pages/login/login.vue b/pages/login/login.vue index f6d33d5..cbc3d35 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -34,16 +34,20 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, methods: { diff --git a/pages/medicine/medicine.vue b/pages/medicine/medicine.vue index 498666a..388c063 100644 --- a/pages/medicine/medicine.vue +++ b/pages/medicine/medicine.vue @@ -49,16 +49,20 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, } diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue index 79d819a..f3bc01d 100644 --- a/pages/nursestation/nursestation.vue +++ b/pages/nursestation/nursestation.vue @@ -327,16 +327,20 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, } diff --git a/pages/order/order.vue b/pages/order/order.vue index 15a16b3..d0f0feb 100644 --- a/pages/order/order.vue +++ b/pages/order/order.vue @@ -77,20 +77,6 @@ }) }, }, - //1.分享给朋友 - onShareAppMessage(res) { - return { - title: '泉医到家', - path: '/pages/startup/startup', - } - }, - //2.分享到朋友圈 - onShareTimeline(res) { - return { - title: '泉医到家', - path: '/pages/startup/startup', - } - }, } diff --git a/pages/picker/style.components.scss b/pages/picker/style.components.scss deleted file mode 100644 index 6835876..0000000 --- a/pages/picker/style.components.scss +++ /dev/null @@ -1,7 +0,0 @@ -// 定义混入指令，用于在非nvue环境下的flex定义，因为nvue没有display属性，会报错 -@mixin vue-flex($direction: row) { - /* #ifndef APP-NVUE */ - display: flex; - flex-direction: $direction; - /* #endif */ -} \ No newline at end of file diff --git a/pages/shopping/shopping.vue b/pages/shopping/shopping.vue index d375d05..64fc427 100644 --- a/pages/shopping/shopping.vue +++ b/pages/shopping/shopping.vue @@ -46,16 +46,20 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //初始化加载 diff --git a/pages/site/site.vue b/pages/site/site.vue index c049aac..283d1e1 100644 --- a/pages/site/site.vue +++ b/pages/site/site.vue @@ -234,16 +234,20 @@ onLoad() {}, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, } diff --git a/pages/startup/startup.vue b/pages/startup/startup.vue index 611759f..b51ad30 100644 --- a/pages/startup/startup.vue +++ b/pages/startup/startup.vue @@ -19,16 +19,20 @@ }, //1.分享给朋友 onShareAppMessage(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, //2.分享到朋友圈 onShareTimeline(res) { + let pages = getCurrentPages(); + let url = pages[pages.length - 1].$page.fullPath return { title: '泉医到家', - path: '/pages/startup/startup', + path: url, } }, onShow() {