From 298ae79e11ea5561e449117f563edf41934f13ca Mon Sep 17 00:00:00 2001 From: caserKing Date: Fri, 2 Aug 2019 13:44:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=8D=A1=E5=8C=85=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/cardorder/index/index.js | 2 + pages/cardorder/index/index.json | 3 +- pages/cardorder/index/index.wxml | 21 +++++++---- pages/cardorder/index/index.wxss | 59 +++++++++++++++++++++++++----- pages/couponorder/index/index.js | 2 + pages/couponorder/index/index.json | 3 +- pages/couponorder/index/index.wxml | 7 ++-- pages/couponorder/index/index.wxss | 2 +- pages/order/index/index.js | 2 + pages/order/index/index.json | 3 +- pages/order/index/index.wxml | 7 ++-- pages/order/index/index.wxss | 2 +- pages/passCar/passCar.js | 17 +++++---- 13 files changed, 95 insertions(+), 35 deletions(-) diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index 9425923..f91895d 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'; const util = require("../../../utils/util.js"); const config = require("../../../config/config.js"); const Http = require("../../../utils/HttpBasics"); @@ -5,6 +6,7 @@ let app = getApp(); const imgurl = require("../../../utils/imgurl"); Page({ data: { + navigationBarHeight, noCoupon: imgurl.noCoupon.url, couponUrl: imgurl.coupon.url, linessUrl: imgurl.liness.url, diff --git a/pages/cardorder/index/index.json b/pages/cardorder/index/index.json index 5f9dfef..a9565ff 100644 --- a/pages/cardorder/index/index.json +++ b/pages/cardorder/index/index.json @@ -1,7 +1,8 @@ { "usingComponents": { "i-tab": "../../../dist/tab/index", - "i-tabs": "../../../dist/tabs/index" + "i-tabs": "../../../dist/tabs/index", + "navbar": "../../../components/navbar/navbar" }, "navigationBarTitleText": "我的卡包", "navigationBarBackgroundColor": "#F4F5F9" diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml index 5f44de9..ede689e 100644 --- a/pages/cardorder/index/index.wxml +++ b/pages/cardorder/index/index.wxml @@ -1,10 +1,11 @@ - - + + + - + - + 请您敬请期待 @@ -15,7 +16,11 @@ - + + + + + @@ -29,7 +34,8 @@ {{item.title}} - 扫一扫付款 + + 扫一扫付款 再次购买 已过期 余额已用完 @@ -42,9 +48,10 @@ - 使用规则 + {{content}} + 使用规则 \ No newline at end of file diff --git a/pages/cardorder/index/index.wxss b/pages/cardorder/index/index.wxss index 85d3ad9..7cd24e3 100644 --- a/pages/cardorder/index/index.wxss +++ b/pages/cardorder/index/index.wxss @@ -9,7 +9,7 @@ height: 88rpx; text-align: center; position: fixed; - top: 0; + /* top: 136rpx; */ left: 0; right: 0; z-index: 100000; @@ -23,24 +23,49 @@ .section { position: relative; + width: 710rpx; + height: 240rpx; + margin: 0 auto 20rpx; + padding: 20rpx 0; + border-radius: 16rpx; + background: #fff; } .mms { position: relative; - width: 690rpx; + width: 670rpx; background: #fff; height: 238rpx; margin: 0 auto 30rpx; - border-radius: 16rpx; box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); } +.cover-img { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + z-index: 0; +} + +.gray-bg { + width: 100%; + height: 100%; + position: absolute; + left: 0; + top: 0; + z-index: 10; + background: rgba(0,0,0,.4); +} + .yu { display: inline-block !important; font-size: 30rpx!important; } .expiretime { + width: 250rpx; } @@ -119,7 +144,7 @@ .btns { position: absolute; right: 25rpx; - bottom: 25rpx; + bottom: -12rpx; text-align: center; font-size: 28rpx; width: 250rpx !important; @@ -127,11 +152,13 @@ line-height: 61rpx; background: rgba(255, 255, 255, 1); border-radius: 30rpx; + z-index: 100; + color: #FD832D!important; } .active { color: #fff; - opacity: 0.6; + opacity: 0.9; } .txt1 { @@ -189,7 +216,7 @@ } .active { - opacity: 0.6; + /* opacity: 0.6; */ } .nav { @@ -217,9 +244,10 @@ font-size: 24rpx; margin-left: 25rpx; text-align: left; + } .txt2{ - opacity:0.5; + /* opacity: .99; */ margin-top: 36rpx; } .imgicon { @@ -258,11 +286,18 @@ font-size: 28rpx; font-family: PingFang-SC-Regular; font-weight: 400; - color: rgba(2, 192, 255, 1); + color: #FD832D; + /* opacity: .99; */ line-height: 44rpx; margin-top: 30rpx; - padding-bottom: 30rpx; background: #fff; + position: fixed; + bottom: 0; + left: 0; + width: 100%; + height: 80rpx; + line-height: 80rpx; + z-index: 100; } .yue text:nth-of-type(1){ margin-right: 6rpx; @@ -300,3 +335,9 @@ button::after{ border: none; } bottom: 0; margin: auto; } + +.detail_msg { + position: absolute; + left: 0; + z-index: 100; +} diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js index 03a7374..610d16a 100644 --- a/pages/couponorder/index/index.js +++ b/pages/couponorder/index/index.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' const util = require("../../../utils/util.js"); const config = require("../../../config/config.js"); const Http = require("../../../utils/HttpBasics"); @@ -5,6 +6,7 @@ const imgurl = require("../../../utils/imgurl"); let app = getApp(); Page({ data: { + navigationBarHeight, couponUrl: imgurl.noCoupon.url, linessUrl: imgurl.liness.url, loadingUrl: imgurl.loading.url, diff --git a/pages/couponorder/index/index.json b/pages/couponorder/index/index.json index 22e6017..80ae0bd 100644 --- a/pages/couponorder/index/index.json +++ b/pages/couponorder/index/index.json @@ -1,7 +1,8 @@ { "usingComponents": { "i-tab": "../../../dist/tab/index", - "i-tabs": "../../../dist/tabs/index" + "i-tabs": "../../../dist/tabs/index", + "navbar": "../../../components/navbar/navbar" }, "navigationBarTitleText": "我的券包", "navigationBarBackgroundColor": "#F4F5F9" diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml index d6be573..af56cc6 100644 --- a/pages/couponorder/index/index.wxml +++ b/pages/couponorder/index/index.wxml @@ -1,7 +1,8 @@ - - + + + - + diff --git a/pages/couponorder/index/index.wxss b/pages/couponorder/index/index.wxss index 7a43cbb..1577e78 100644 --- a/pages/couponorder/index/index.wxss +++ b/pages/couponorder/index/index.wxss @@ -35,7 +35,7 @@ button::after{ border: none; } height: 88rpx; text-align: center; position: fixed; - top: 0; + /* top: 0; */ left: 0; right: 0; z-index: 100000; diff --git a/pages/order/index/index.js b/pages/order/index/index.js index 27f18d6..39eb742 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -1,3 +1,4 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' let config = require("../../../config/config.js"); let Http = require("../../../utils/HttpBasics"); const util = require("../../../utils/util"); @@ -5,6 +6,7 @@ let app = getApp(); const imgurl = require("../../../utils/imgurl"); Page({ data: { + navigationBarHeight, noOrdersUrl: imgurl.noOrders.url, loadingUrl: imgurl.loading.url, wmhome: imgurl.wmhome.url, diff --git a/pages/order/index/index.json b/pages/order/index/index.json index 3c08631..6a4b956 100644 --- a/pages/order/index/index.json +++ b/pages/order/index/index.json @@ -1,7 +1,8 @@ { "usingComponents": { "i-tab": "../../../dist/tab/index", - "i-tabs": "../../../dist/tabs/index" + "i-tabs": "../../../dist/tabs/index", + "navbar": "../../../components/navbar/navbar" }, "navigationBarTitleText": "我的订单", "navigationBarBackgroundColor": "#F4F5F9" diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml index bb7d06f..eaedb42 100644 --- a/pages/order/index/index.wxml +++ b/pages/order/index/index.wxml @@ -1,6 +1,7 @@ - - - + + + + diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss index 8300063..07c2e9a 100644 --- a/pages/order/index/index.wxss +++ b/pages/order/index/index.wxss @@ -8,7 +8,7 @@ position: fixed; width: 100% !important; height: 96rpx; - top: 0; + /* top: 0; */ left: 0; right: 0; text-align: center; diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 32e0ff1..250da02 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -431,14 +431,15 @@ Page({ that.initUsrCarList(); }) .catch(err => { - console.log(err) - wx.showToast({ - // title: err.message, - title: '未查到', - icon: 'none', - duration: 2000, - mask: false - }); + if (err.message!=undefined) { + wx.showToast({ + title: err.message, + icon: 'none', + duration: 2000, + mask: false + }); + } + }) }, /**