From c88c189c636306e340292e38daa1c33a1ac8b9c0 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sat, 3 Aug 2019 14:06:48 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8E=88=E6=9D=83=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C=E6=8E=88=E6=9D=83=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E6=83=A0=E5=88=B8][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=AD=94=E9=A2=98=E9=97=AE=E5=8D=B7?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/bannerdetail/index.js | 1 - pages/coupon/detail/index.wxml | 2 +- pages/coupon/detail/index.wxss | 10 ---------- pages/getphoneInfo/index.js | 4 +++- pages/getphoneInfo/index.json | 4 +++- pages/getphoneInfo/index.wxml | 8 ++++++-- pages/getphoneInfo/index.wxss | 28 ++++++++++++++++++++++++---- pages/getuserinfo/index.js | 2 ++ pages/getuserinfo/index.json | 4 +++- pages/getuserinfo/index.wxml | 11 +++++++---- pages/getuserinfo/index.wxss | 33 ++++++++++++++++++++++++--------- pages/radetail/index.wxml | 24 ++++-------------------- 12 files changed, 77 insertions(+), 54 deletions(-) diff --git a/pages/bannerdetail/index.js b/pages/bannerdetail/index.js index 6aed197..900f6e6 100644 --- a/pages/bannerdetail/index.js +++ b/pages/bannerdetail/index.js @@ -48,5 +48,4 @@ Page({ url: '/pages/main/index', }) }, - }); diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 2b89d36..2e28189 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -159,7 +159,7 @@ - + diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss index 326b548..f256b31 100644 --- a/pages/coupon/detail/index.wxss +++ b/pages/coupon/detail/index.wxss @@ -450,16 +450,6 @@ button::after { background: #ff4949; } -.b1 { - position: fixed; - bottom: 0px; - left: 0px; - right: 0px; - top:170rpx; - background: rgba(0, 0, 0, 0.8); - overflow: hidden; - z-index: 10; -} .con { position: absolute; diff --git a/pages/getphoneInfo/index.js b/pages/getphoneInfo/index.js index 7b6dba2..12f0916 100755 --- a/pages/getphoneInfo/index.js +++ b/pages/getphoneInfo/index.js @@ -1,8 +1,10 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' var config = require("../../config/config.js"); const Http = require("../../utils/HttpBasics"); var app = getApp(); Page({ data: { + navigationBarHeight, canIUse: wx.canIUse("button.open-type.getPhoneNumber"), couponChannelId: "", path:null, @@ -136,7 +138,7 @@ Page({ }) .catch(err => { wx.showToast({ - title: err.message, + title: "请授权手机号", icon: 'none', duration: 2000, mask: false diff --git a/pages/getphoneInfo/index.json b/pages/getphoneInfo/index.json index 2303215..88eeb8e 100755 --- a/pages/getphoneInfo/index.json +++ b/pages/getphoneInfo/index.json @@ -1,3 +1,5 @@ { - "navigationBarTitleText": "" + "usingComponents": { + "navbar": "../../components/navbar/navbar" + } } \ No newline at end of file diff --git a/pages/getphoneInfo/index.wxml b/pages/getphoneInfo/index.wxml index 9cc7825..ace606c 100755 --- a/pages/getphoneInfo/index.wxml +++ b/pages/getphoneInfo/index.wxml @@ -1,9 +1,13 @@ +