diff --git a/components/navbar/navbar.js b/components/navbar/navbar.js index 2abdbf9..dd329f6 100644 --- a/components/navbar/navbar.js +++ b/components/navbar/navbar.js @@ -29,7 +29,14 @@ Component({ statusBarHeight: app.statusBarHeight + 'px', navigationBarHeight: (app.statusBarHeight + 44) + 'px' }, - + ready(){ + let pages = getCurrentPages(); + if (pages&&pages.length>0){ + this.setData({ + back:false + }) + } + }, methods: { backHome: function () { wx.switchTab({ diff --git a/components/navbar/navbar.wxss b/components/navbar/navbar.wxss index f9e767e..189ca6c 100644 --- a/components/navbar/navbar.wxss +++ b/components/navbar/navbar.wxss @@ -5,8 +5,6 @@ left: 0; top: 0; z-index: 400000000; - top:0; - left: 0; } .title-container { @@ -19,12 +17,12 @@ .capsule { margin-left: 10px; height: 32px; - border: 1px solid #f2f2f2; + border: 1px solid #e1e1e3; border-radius: 60px; display: flex; - background: #fbfbfd; align-items: center; padding: 0 20rpx; + background: #fbfbfd; } .capsule > view { diff --git a/pages/complete/index.js b/pages/complete/index.js index 2a35997..dbe3e5a 100644 --- a/pages/complete/index.js +++ b/pages/complete/index.js @@ -8,7 +8,7 @@ Page({ */ data: { navigationBarHeight, - success01: imgurl.success01.url, + chenggong: imgurl.chenggong.url, couponOrderId:'' }, diff --git a/pages/complete/index.wxml b/pages/complete/index.wxml index c150983..9800b5b 100644 --- a/pages/complete/index.wxml +++ b/pages/complete/index.wxml @@ -4,7 +4,7 @@ - + 领取成功 diff --git a/pages/complete/index.wxss b/pages/complete/index.wxss index 2f6adac..1570a41 100644 --- a/pages/complete/index.wxss +++ b/pages/complete/index.wxss @@ -9,7 +9,7 @@ page { margin: 60rpx auto 0; width:657rpx; height:11rpx; - background:rgba(2,192,255,1); + background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); border-radius:6px; } .c-top-center{ @@ -55,5 +55,5 @@ line-height:50rpx; width: 636rpx; border-radius: 50rpx; margin-top: 30rpx; - background: #02C0FF!important; + background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); } \ No newline at end of file diff --git a/pages/radetail/index.js b/pages/radetail/index.js index 85936a8..a38b067 100644 --- a/pages/radetail/index.js +++ b/pages/radetail/index.js @@ -26,6 +26,7 @@ Page({ }, onLoad(options) { let that = this; + wx.hideShareMenu(); if(options&&options.id){ that.setData({ activityId: options.id @@ -100,5 +101,14 @@ Page({ url: '/pages/main/index', }) }, - + onShareAppMessage: function (options) { + var that = this; + let shareObj = {}; + // 来自页面内的按钮的转发 + if (options.from == 'button') { + var eData = options.target.dataset.id; + shareObj.path = `/pages/index/index?id=${eData}&type=ra`; + } + return shareObj; + }, }); \ No newline at end of file diff --git a/pages/radetail/index.wxml b/pages/radetail/index.wxml index 70dd844..615b8d6 100644 --- a/pages/radetail/index.wxml +++ b/pages/radetail/index.wxml @@ -13,7 +13,7 @@ - + 分享