diff --git a/app.json b/app.json index b63a55e..3da5b82 100644 --- a/app.json +++ b/app.json @@ -6,13 +6,13 @@ "pages/market/index", "pages/user/index", "pages/coupon/detail/index", // 券详情 - "pages/shop/details/index", + "pages/shop/detail/index", // 店铺详情 "pages/rushToBuy/index", "pages/shop/index/index", "pages/couponorder/index/index", // 券包列表 "pages/couponorder/detail/index", // 券包详情 - "pages/order/details/index", - "pages/order/index/index", + "pages/order/detail/index", // 订单详情 + "pages/order/index/index", // 订单列表 "pages/success/index", "pages/login/index", "pages/park/park", diff --git a/pages/getphoneInfo/index.js b/pages/getphoneInfo/index.js index 2bc0537..dffd200 100755 --- a/pages/getphoneInfo/index.js +++ b/pages/getphoneInfo/index.js @@ -32,7 +32,7 @@ Page({ icon: "success", success: function(res) { wx.redirectTo({ - url: '../coupons/details/index?id=' + that.data.couponId + "&flag=pay", + url: '../coupon/detail/index?id=' + that.data.couponId + "&flag=pay", }) } }) diff --git a/pages/order/details/index.js b/pages/order/detail/index.js similarity index 100% rename from pages/order/details/index.js rename to pages/order/detail/index.js diff --git a/pages/order/details/index.json b/pages/order/detail/index.json similarity index 100% rename from pages/order/details/index.json rename to pages/order/detail/index.json diff --git a/pages/order/details/index.wxml b/pages/order/detail/index.wxml similarity index 100% rename from pages/order/details/index.wxml rename to pages/order/detail/index.wxml diff --git a/pages/order/details/index.wxss b/pages/order/detail/index.wxss similarity index 94% rename from pages/order/details/index.wxss rename to pages/order/detail/index.wxss index cbe530f..20218f1 100644 --- a/pages/order/details/index.wxss +++ b/pages/order/detail/index.wxss @@ -1,145 +1,145 @@ -@import '../../../app.wxss'; -.order { - width: 100%; -} -.tips { - width: 92%; - height: 88rpx; - background: #00C0FF; - color: #fff; - padding: 0 4%; - line-height: 88rpx; -} -.tips text:nth-child(2) { - font-size: 24rpx; - padding-left: 16rpx; -} -.tips text:nth-child(1) { - width: 32rpx; - height: 32rpx; - background: #fff; - border-radius: 50%; - color: #00C0FF; - line-height: 32rpx; - text-align: center; - display: inline-block; - font-size: 28rpx; -} -.section { - margin-top: 2%; -} -.detail_msg { - width: 92%; - height: 220rpx !important; - background: #fff; - display: flex; - margin: 0 4%; - margin-top: 2%; - border-bottom: 1px solid #ededed; -} - -.logo { - width: 248rpx; - height: 184rpx; - border-radius: 30rpx; -} - -.logo image { - width: 100%; - height: 100%; -} - -.info view:nth-child(1) { - display: flex; - justify-content: space-between; - padding: 0 4%; -} - -.info { - width: 100%; -} - -.info view:nth-child(1) { - margin-bottom: 72rpx; -} - -.info view:nth-child(1) text { - font-size: 30rpx; -} - -.info view:nth-child(1) text:nth-child(2) { - color: #ffae00; - font-size: 24rpx; -} - -.info view:nth-child(2), .info view:nth-child(3) { - color: #ff3434; - font-size: 24rpx; - padding-left: 4%; -} - -.info view:nth-child(2) text, .info view:nth-child(3) text { - font-size: 22rpx; - color: #b8b8b8; -} - -.info view:nth-child(3) { - margin-top: 5rpx; -} - -.payment { - width: 92%; - height: 120rpx; - line-height: 120rpx; - padding: 0 4%; - display: flex; - justify-content: space-between; - border-bottom: 20rpx solid #EDEDED; -} - -.payment view:nth-child(2) text:nth-child(1) { - font-size: 36rpx; - color: #ff3434; - font-weight: bold; -} - -.payment view:nth-child(2) text:nth-child(2) { - font-size: 24rpx; - color: #b4b4b4; - padding-left: 18rpx; - text-decoration: line-through; -} -.classif { - width: 100%; -} -.classif>view{ - height: 88rpx; - line-height: 88rpx; - display: flex; - justify-content: space-between; - padding-left: 4%; - padding-right: 4%; -} -.classif>view text{ - font-size: 30rpx; -} -.classif>view text:nth-child(2){ - color: #B8B8B8; - font-size: 30rpx; -} -.classif>view:nth-child(1) { - display: block; -} -.classif>view:nth-child(1) text:nth-child(2) { - padding-left: 15rpx; -} -.classif>view:nth-child(3),.classif>view:nth-child(4) { - border-top: 20rpx solid #EDEDED; -} -.classif>view:nth-child(3) view text:nth-child(2) { - padding-left: 15rpx; -} -.classif>view:nth-child(6) text:nth-child(2){ - color: #FF3434; - font-weight: bold; +@import '../../../app.wxss'; +.order { + width: 100%; +} +.tips { + width: 92%; + height: 88rpx; + background: #00C0FF; + color: #fff; + padding: 0 4%; + line-height: 88rpx; +} +.tips text:nth-child(2) { + font-size: 24rpx; + padding-left: 16rpx; +} +.tips text:nth-child(1) { + width: 32rpx; + height: 32rpx; + background: #fff; + border-radius: 50%; + color: #00C0FF; + line-height: 32rpx; + text-align: center; + display: inline-block; + font-size: 28rpx; +} +.section { + margin-top: 2%; +} +.detail_msg { + width: 92%; + height: 220rpx !important; + background: #fff; + display: flex; + margin: 0 4%; + margin-top: 2%; + border-bottom: 1px solid #ededed; +} + +.logo { + width: 248rpx; + height: 184rpx; + border-radius: 30rpx; +} + +.logo image { + width: 100%; + height: 100%; +} + +.info view:nth-child(1) { + display: flex; + justify-content: space-between; + padding: 0 4%; +} + +.info { + width: 100%; +} + +.info view:nth-child(1) { + margin-bottom: 72rpx; +} + +.info view:nth-child(1) text { + font-size: 30rpx; +} + +.info view:nth-child(1) text:nth-child(2) { + color: #ffae00; + font-size: 24rpx; +} + +.info view:nth-child(2), .info view:nth-child(3) { + color: #ff3434; + font-size: 24rpx; + padding-left: 4%; +} + +.info view:nth-child(2) text, .info view:nth-child(3) text { + font-size: 22rpx; + color: #b8b8b8; +} + +.info view:nth-child(3) { + margin-top: 5rpx; +} + +.payment { + width: 92%; + height: 120rpx; + line-height: 120rpx; + padding: 0 4%; + display: flex; + justify-content: space-between; + border-bottom: 20rpx solid #EDEDED; +} + +.payment view:nth-child(2) text:nth-child(1) { + font-size: 36rpx; + color: #ff3434; + font-weight: bold; +} + +.payment view:nth-child(2) text:nth-child(2) { + font-size: 24rpx; + color: #b4b4b4; + padding-left: 18rpx; + text-decoration: line-through; +} +.classif { + width: 100%; +} +.classif>view{ + height: 88rpx; + line-height: 88rpx; + display: flex; + justify-content: space-between; + padding-left: 4%; + padding-right: 4%; +} +.classif>view text{ + font-size: 30rpx; +} +.classif>view text:nth-child(2){ + color: #B8B8B8; + font-size: 30rpx; +} +.classif>view:nth-child(1) { + display: block; +} +.classif>view:nth-child(1) text:nth-child(2) { + padding-left: 15rpx; +} +.classif>view:nth-child(3),.classif>view:nth-child(4) { + border-top: 20rpx solid #EDEDED; +} +.classif>view:nth-child(3) view text:nth-child(2) { + padding-left: 15rpx; +} +.classif>view:nth-child(6) text:nth-child(2){ + color: #FF3434; + font-weight: bold; } \ No newline at end of file diff --git a/pages/shop/details/index.js b/pages/shop/detail/index.js similarity index 100% rename from pages/shop/details/index.js rename to pages/shop/detail/index.js diff --git a/pages/shop/details/index.json b/pages/shop/detail/index.json similarity index 100% rename from pages/shop/details/index.json rename to pages/shop/detail/index.json diff --git a/pages/shop/details/index.wxml b/pages/shop/detail/index.wxml similarity index 100% rename from pages/shop/details/index.wxml rename to pages/shop/detail/index.wxml diff --git a/pages/shop/details/index.wxss b/pages/shop/detail/index.wxss similarity index 93% rename from pages/shop/details/index.wxss rename to pages/shop/detail/index.wxss index c39c8f0..1ea9253 100644 --- a/pages/shop/details/index.wxss +++ b/pages/shop/detail/index.wxss @@ -1,174 +1,174 @@ -.spdetailContainer{ - width: 100%; - height: 100%; - background: #eee; -} -.spheader{ - width: 100%; - height: 186rpx; - background: #fff; - display: flex; - flex-direction: row; -} -.spheaderL{ - flex: 1; - display: flex; - justify-content: center; - align-items: center; -} -.spheaderM{ - flex: 2; - display: flex; - flex-direction: column; - justify-content: left; - align-self: center; -} -.shopname{ - font-size: 31rpx; - color: #000; -} -.shopaddress{ - font-size: 22rpx; - color: #B8B8B8; - margin-top: 20rpx; -} -.spheaderR{ - flex: 1; - display: flex; - justify-content: center; - align-items: center; -} -.splogo{ - width: 150rpx; - height: 150rpx; -} -.spcode{ - width: 100rpx; - height: 100rpx; -} -.spheaderNext{ - width: 100%; - height: 150rpx; - background: #fff; - display: flex; - flex-direction: column; - padding-top: 10rpx; -} -.NextTop{ - margin-left: 30rpx; - font-size: 30rpx; - color: #000; -} -.NextBottom{ - margin-top: 23rpx; - display: flex; - flex-direction: row; - margin-left: 30rpx; -} -.addresslogo{ - width: 20rpx; - height: 20rpx; -} -.spphone{ - width: 44rpx; - height: 44rpx; -} -.NextBottomL{ - flex: 1; - color: #c0c0c0; - font-size: 22rpx; - align-self: center; -} -.NextBottomM{ - flex: 3.5; - justify-content: left; - font-size:22rpx; - color: #00C0FF; - align-self: center; - border-top-width: 2rpx; - border-color: #00C0FF; -} -.NextBottomR{ - flex: .5 -} -.storeDiscount{ - width: 100%; - height: auto; - background: #fff; - margin-top: 30rpx -} -.storeDiscountTitle{ - width: 100%; - height: 87rpx; - line-height: 87rpx; -} -.storeDiscountTitle text{ - margin-left: 30rpx; - font-size:28rpx; - color: #000; - border-bottom: 1px solid #fff; -} -.storeDiscountCon{ - width: 100%; - height: auto; - background: #fff; - flex-direction: column; -} -.storeDiscountConItem{ - width: 100%; - height: 244rpx; - display: flex; - flex-direction: row; -} -.ConItemL{ - flex: 1; - align-self: center; -} -.foodpng{ - width: 248rpx; - height: 184rpx; - margin-left: 30rpx; -} -.ConItemR{ - margin-top: 22rpx; - flex: 4; - padding-left: 20rpx; -} -.ConItemRT{ - color: #000; - font-size: 30rpx; -} -.ConItemRM{ - margin-top: 10rpx; -} -.presentPrice{ - font-size: 36rpx; - color: #FF3434; - margin-right: 20rpx; -} -.originalPrice{ - font-size: 24rpx; - color: #B4B4B4; - text-decoration: line-through; -} -.ConItemRB{ - margin-top: 35rpx; -} -.soldnum{ - color: #585858; - font-size: 22rpx; -} -.buy{ - margin-left: 215rpx; - background: #00C0FF; - color: #fff; - font-size: 28rpx; - width: 114rpx; - height: 50rpx; - line-height: 50rpx; - text-align: center; - border-radius: 10rpx; - display: inline-block; - -} - +.spdetailContainer{ + width: 100%; + height: 100%; + background: #eee; +} +.spheader{ + width: 100%; + height: 186rpx; + background: #fff; + display: flex; + flex-direction: row; +} +.spheaderL{ + flex: 1; + display: flex; + justify-content: center; + align-items: center; +} +.spheaderM{ + flex: 2; + display: flex; + flex-direction: column; + justify-content: left; + align-self: center; +} +.shopname{ + font-size: 31rpx; + color: #000; +} +.shopaddress{ + font-size: 22rpx; + color: #B8B8B8; + margin-top: 20rpx; +} +.spheaderR{ + flex: 1; + display: flex; + justify-content: center; + align-items: center; +} +.splogo{ + width: 150rpx; + height: 150rpx; +} +.spcode{ + width: 100rpx; + height: 100rpx; +} +.spheaderNext{ + width: 100%; + height: 150rpx; + background: #fff; + display: flex; + flex-direction: column; + padding-top: 10rpx; +} +.NextTop{ + margin-left: 30rpx; + font-size: 30rpx; + color: #000; +} +.NextBottom{ + margin-top: 23rpx; + display: flex; + flex-direction: row; + margin-left: 30rpx; +} +.addresslogo{ + width: 20rpx; + height: 20rpx; +} +.spphone{ + width: 44rpx; + height: 44rpx; +} +.NextBottomL{ + flex: 1; + color: #c0c0c0; + font-size: 22rpx; + align-self: center; +} +.NextBottomM{ + flex: 3.5; + justify-content: left; + font-size:22rpx; + color: #00C0FF; + align-self: center; + border-top-width: 2rpx; + border-color: #00C0FF; +} +.NextBottomR{ + flex: .5 +} +.storeDiscount{ + width: 100%; + height: auto; + background: #fff; + margin-top: 30rpx +} +.storeDiscountTitle{ + width: 100%; + height: 87rpx; + line-height: 87rpx; +} +.storeDiscountTitle text{ + margin-left: 30rpx; + font-size:28rpx; + color: #000; + border-bottom: 1px solid #fff; +} +.storeDiscountCon{ + width: 100%; + height: auto; + background: #fff; + flex-direction: column; +} +.storeDiscountConItem{ + width: 100%; + height: 244rpx; + display: flex; + flex-direction: row; +} +.ConItemL{ + flex: 1; + align-self: center; +} +.foodpng{ + width: 248rpx; + height: 184rpx; + margin-left: 30rpx; +} +.ConItemR{ + margin-top: 22rpx; + flex: 4; + padding-left: 20rpx; +} +.ConItemRT{ + color: #000; + font-size: 30rpx; +} +.ConItemRM{ + margin-top: 10rpx; +} +.presentPrice{ + font-size: 36rpx; + color: #FF3434; + margin-right: 20rpx; +} +.originalPrice{ + font-size: 24rpx; + color: #B4B4B4; + text-decoration: line-through; +} +.ConItemRB{ + margin-top: 35rpx; +} +.soldnum{ + color: #585858; + font-size: 22rpx; +} +.buy{ + margin-left: 215rpx; + background: #00C0FF; + color: #fff; + font-size: 28rpx; + width: 114rpx; + height: 50rpx; + line-height: 50rpx; + text-align: center; + border-radius: 10rpx; + display: inline-block; + +} +